- if (!_fixed_diameter) {
- _diameter = std::min (_width, _height);
- }
-
- //background
+ if (!_fixed_diameter) {
+ _diameter = std::min (get_width(), get_height());
+ }
- if (parent && parent->get_has_window()) {
- style = parent->get_style ();
- c = style->get_bg (parent->get_state());
- } else {
- style = get_style ();
- c = style->get_bg (get_state());
- }
+ while (parent && !parent->get_has_window()) {
+ parent = parent->get_parent();
+ }
- cairo_rectangle(cr, 0, 0, _width, _height);
- cairo_stroke_preserve(cr);
- cairo_set_source_rgb(cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- cairo_fill(cr);
+#if 0
+ cairo_rectangle(cr, 0, 0, _width, _height);
+ cairo_stroke_preserve(cr);
+ cairo_set_source_rgb(cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+ cairo_fill(cr);
+#endif
//inset
cairo_pattern_t *pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
cairo_pattern_add_color_stop_rgba (pat, 0, 0,0,0, 0.4);
//inset
cairo_pattern_t *pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
cairo_pattern_add_color_stop_rgba (pat, 0, 0,0,0, 0.4);
- cairo_set_source_rgba (cr, _red, _green, _blue, _active ? 0.8 : 0.2);
+ cairo_set_source_rgba (cr, _red, _green, _blue, (active_state() == Gtkmm2ext::ExplicitActive) ? 0.8 : 0.2);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_fill(cr);
//reflection
cairo_scale(cr, 0.7, 0.7);
cairo_pattern_t *pat2 = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter/2-3);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_fill(cr);
//reflection
cairo_scale(cr, 0.7, 0.7);
cairo_pattern_t *pat2 = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter/2-3);
- cairo_pattern_add_color_stop_rgba (pat2, 0, 1,1,1, _active ? 0.4 : 0.2);
+ cairo_pattern_add_color_stop_rgba (pat2, 0, 1,1,1, active_state() ? 0.4 : 0.2);
cairo_pattern_add_color_stop_rgba (pat2, 1, 1,1,1, 0.0);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_set_source (cr, pat2);
cairo_fill (cr);
cairo_pattern_destroy (pat2);
cairo_pattern_add_color_stop_rgba (pat2, 1, 1,1,1, 0.0);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_set_source (cr, pat2);
cairo_fill (cr);
cairo_pattern_destroy (pat2);
-#endif
-
- cairo_set_source_rgba (cr, _red, _green, _blue, 1.0);
- cairo_arc (cr, 0, 0, _diameter/2-5, 0, 2 * M_PI);
- cairo_fill(cr);
- if (_fixed_diameter) {
- req->width = _diameter;
- req->height = _diameter;
- } else {
- CairoWidget::on_size_request (req);
- }
+ if (_fixed_diameter) {
+ req->width = _diameter;
+ req->height = _diameter;
+ } else {
+ CairoWidget::on_size_request (req);
+ }
- RefPtr<Style> style = get_style();
- Color c;
-
- switch (_visual_state) {
- case 0:
- c = style->get_fg (STATE_NORMAL);
- break;
- default:
- c = style->get_fg (STATE_ACTIVE);
- break;
- }
-
- _red = c.get_red_p ();
- _green = c.get_green_p ();
- _blue = c.get_blue_p ();
-
- set_dirty ();
+ RefPtr<Style> style = get_style();
+ Color c;
+
+ switch (_visual_state) {
+ case VisualState(0):
+ c = style->get_fg (STATE_NORMAL);
+ break;
+ default:
+ c = style->get_fg (STATE_ACTIVE);
+ break;
+ }
+
+ _red = c.get_red_p ();
+ _green = c.get_green_p ();
+ _blue = c.get_blue_p ();
+
+ set_dirty ();