summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-03-08 00:18:25 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-03-08 00:18:25 +0000
commit4855a8a2cb986d8bec382430c463c070226aab38 (patch)
tree49849474fce82f8ede13aee3b7dd0c82f66e592c /src
parentRemove reload UI and some theming fixes (diff)
downloadinkscape-4855a8a2cb986d8bec382430c463c070226aab38.tar.gz
inkscape-4855a8a2cb986d8bec382430c463c070226aab38.zip
Show LPE popups on over
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/livepatheffect-add.cpp9
-rw-r--r--src/ui/dialog/livepatheffect-add.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index ccaafdf62..452138aa0 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -76,6 +76,7 @@ bool LivePathEffectAdd::mouseout(GdkEventCrossing *evt, GtkWidget *wdg)
{
GdkWindow *window = gtk_widget_get_window(wdg);
gdk_window_set_cursor(window, nullptr);
+ hide_pop_description(evt);
return true;
}
@@ -140,7 +141,7 @@ LivePathEffectAdd::LivePathEffectAdd()
LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG));
Gtk::EventBox *LPESelectorEffectEventInfo;
builder_effect->get_widget("LPESelectorEffectEventInfo", LPESelectorEffectEventInfo);
- LPESelectorEffectEventInfo->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder>>(
+ LPESelectorEffectEventInfo->signal_enter_notify_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder>>(
sigc::mem_fun(*this, &LivePathEffectAdd::pop_description), builder_effect));
Gtk::EventBox *LPESelectorEffectEventFav;
builder_effect->get_widget("LPESelectorEffectEventFav", LPESelectorEffectEventFav);
@@ -186,7 +187,7 @@ LivePathEffectAdd::LivePathEffectAdd()
sigc::mem_fun(*this, &LivePathEffectAdd::mouseout), GTK_WIDGET(_LPESelectorEffectEventFavShow->gobj())));
_LPESelectorEffectEventFavShow->signal_button_press_event().connect(
sigc::mem_fun(*this, &LivePathEffectAdd::show_fav_toggler));
- _LPESelectorEffectInfoEventBox->signal_button_press_event().connect(
+ _LPESelectorEffectInfoEventBox->signal_leave_notify_event().connect(
sigc::mem_fun(*this, &LivePathEffectAdd::hide_pop_description));
_LPESelectorEffectInfoEventBox->signal_enter_notify_event().connect(sigc::bind<GtkWidget *>(
sigc::mem_fun(*this, &LivePathEffectAdd::mouseover), GTK_WIDGET(_LPESelectorEffectInfoEventBox->gobj())));
@@ -231,7 +232,7 @@ void LivePathEffectAdd::on_activate(Gtk::FlowBoxChild *child)
child->show_all_children();
}
-bool LivePathEffectAdd::pop_description(GdkEventButton *evt, Glib::RefPtr<Gtk::Builder> builder_effect)
+bool LivePathEffectAdd::pop_description(GdkEventCrossing *evt, Glib::RefPtr<Gtk::Builder> builder_effect)
{
Gtk::Image *LPESelectorEffectInfo;
builder_effect->get_widget("LPESelectorEffectInfo", LPESelectorEffectInfo);
@@ -261,7 +262,7 @@ bool LivePathEffectAdd::pop_description(GdkEventButton *evt, Glib::RefPtr<Gtk::B
return true;
}
-bool LivePathEffectAdd::hide_pop_description(GdkEventButton *evt)
+bool LivePathEffectAdd::hide_pop_description(GdkEventCrossing *evt)
{
_LPESelectorEffectInfoPop->hide();
return true;
diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h
index d1767ca3e..938eb768a 100644
--- a/src/ui/dialog/livepatheffect-add.h
+++ b/src/ui/dialog/livepatheffect-add.h
@@ -66,8 +66,8 @@ class LivePathEffectAdd {
int on_sort(Gtk::FlowBoxChild *child1, Gtk::FlowBoxChild *child2);
void on_search();
void on_activate(Gtk::FlowBoxChild *child);
- bool pop_description(GdkEventButton *evt, Glib::RefPtr<Gtk::Builder> builder_effect);
- bool hide_pop_description(GdkEventButton *evt);
+ bool pop_description(GdkEventCrossing *evt, Glib::RefPtr<Gtk::Builder> builder_effect);
+ bool hide_pop_description(GdkEventCrossing *evt);
bool fav_toggler(GdkEventButton *evt, Glib::RefPtr<Gtk::Builder> builder_effect);
bool apply(GdkEventButton *evt, Glib::RefPtr<Gtk::Builder> builder_effect,
const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *to_add);