diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2015-08-23 07:56:51 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-08-23 07:56:51 +0000 |
| commit | 3ceea01eb205a49ac27103b1d21a362dd46dc223 (patch) | |
| tree | 6557f88bfcbd933b3319f8d4d097335f958b74c1 /src | |
| parent | Add 'inkscape:_templateinfo' back to sp-factory.cpp (got lost in r13940). (diff) | |
| download | inkscape-3ceea01eb205a49ac27103b1d21a362dd46dc223.tar.gz inkscape-3ceea01eb205a49ac27103b1d21a362dd46dc223.zip | |
Revert custom gdl patch (focus indicator of docked dialogs) for Quartz backend (bug #1363998)
Fixed bugs:
- https://launchpad.net/bugs/1363998
(bzr r14319)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libgdl/gdl-dock-item-grip.c | 3 | ||||
| -rw-r--r-- | src/libgdl/gdl-dock-item.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c index d23eb7f98..9b3810c20 100644 --- a/src/libgdl/gdl-dock-item-grip.c +++ b/src/libgdl/gdl-dock-item-grip.c @@ -149,6 +149,8 @@ gdl_dock_item_grip_expose (GtkWidget *widget, } +/* see bug #950556: may contribute to regression with GTK2/Quartz */ +#if !defined(GDK_WINDOWING_QUARTZ) if (gdl_dock_item_or_child_has_focus(grip->item)) { gtk_paint_focus (gtk_widget_get_style (widget), @@ -157,6 +159,7 @@ gdl_dock_item_grip_expose (GtkWidget *widget, &event->area, widget, NULL, 0, 0, -1, -1); } +#endif //GDK_WINDOWING_QUARTZ return GTK_WIDGET_CLASS (gdl_dock_item_grip_parent_class)->expose_event (widget, event); } diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c index afcd4dfcb..af630e681 100644 --- a/src/libgdl/gdl-dock-item.c +++ b/src/libgdl/gdl-dock-item.c @@ -1064,8 +1064,11 @@ gdl_dock_item_paint (GtkWidget *widget, "dockitem", 0, 0, -1, -1); +/* see bug #950556: avoid regression with GTK2/Quartz */ +#if !defined(GDK_WINDOWING_QUARTZ) if (GTK_IS_WIDGET(item->_priv->grip)) gtk_widget_queue_draw (GTK_WIDGET(item->_priv->grip)); +#endif } static gint |