diff options
| author | John Bintz <me@johnbintz.com> | 2008-04-21 23:39:46 +0000 |
|---|---|---|
| committer | johncoswell <johncoswell@users.sourceforge.net> | 2008-04-21 23:39:46 +0000 |
| commit | f01977b94fb00a992f0180198e5aafc0e2a76965 (patch) | |
| tree | f9abea6b7cc8aa28d03344f0e7d930634f5abacc /src/dialogs/swatches.cpp | |
| parent | Oops, this broke selecting a swatch, rolling back... (diff) | |
| download | inkscape-f01977b94fb00a992f0180198e5aafc0e2a76965.tar.gz inkscape-f01977b94fb00a992f0180198e5aafc0e2a76965.zip | |
Fix swatch enter-notify event propagation
(bzr r5485)
Diffstat (limited to 'src/dialogs/swatches.cpp')
| -rw-r--r-- | src/dialogs/swatches.cpp | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index f464d548a..3b62f0186 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -240,20 +240,21 @@ static void handleSecondaryClick( GtkWidget* widget, gint arg1, gpointer callbac } } -// static void handleEnterNotify( GtkWidget* widget, GdkEventCrossing* event, gpointer callback_data ) { -// ColorItem* item = reinterpret_cast<ColorItem*>(callback_data); -// if ( item ) { -// SPDesktop *desktop = SP_ACTIVE_DESKTOP; -// if ( desktop ) { -// desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( -// _("Swatch info: <b>"), -// item->def.descr.c_str(), -// _("</b>"), -// NULL -// )); -// } -// } -// } +static gboolean handleEnterNotify( GtkWidget* widget, GdkEventCrossing* event, gpointer callback_data ) { + ColorItem* item = reinterpret_cast<ColorItem*>(callback_data); + if ( item ) { + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + if ( desktop ) { + desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( + _("Swatch info: <b>"), + item->def.descr.c_str(), + _("</b>"), + NULL + )); + } + } + return FALSE; +} static GtkWidget* popupMenu = 0; static ColorItem* bounceTarget = 0; @@ -604,15 +605,10 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS G_CALLBACK(dragBegin), this ); -// g_signal_connect( G_OBJECT(newBlot->gobj()), -// "enter-notify-event", -// G_CALLBACK(handleEnterNotify), -// this); - -// g_signal_connect( G_OBJECT(newBlot->gobj()), -// "enter-notify-event", -// G_CALLBACK(handleEnterNotify), -// this); + g_signal_connect( G_OBJECT(newBlot->gobj()), + "enter-notify-event", + G_CALLBACK(handleEnterNotify), + this); // g_signal_connect( G_OBJECT(newBlot->gobj()), // "drag-drop", |