Author: Carlos Lopez <[email protected]>
Date: Sun Apr 1 10:47:51 2012 +0200
Don't need to warp key release events because it duplicates the action.
Fix bug: Pivotal tracker #27289687 Keyboard shortcuts make the action happen
twice if Layers Panel is on focus
---
synfig-studio/src/gui/canvasview.cpp | 15 ---------------
synfig-studio/src/gui/canvasview.h | 1 -
synfig-studio/src/gui/docks/dockdialog.cpp | 15 ---------------
synfig-studio/src/gui/docks/dockdialog.h | 1 -
synfig-studio/src/gui/toolbox.cpp | 15 ---------------
synfig-studio/src/gui/toolbox.h | 1 -
6 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/synfig-studio/src/gui/canvasview.cpp
b/synfig-studio/src/gui/canvasview.cpp
index 1f1da1b..c13895f 100644
--- a/synfig-studio/src/gui/canvasview.cpp
+++ b/synfig-studio/src/gui/canvasview.cpp
@@ -2429,21 +2429,6 @@ CanvasView::on_key_press_event(GdkEventKey* event)
}
bool
-CanvasView::on_key_release_event(GdkEventKey* event)
-{
- Gtk::Widget* focused_widget = get_focus();
- if(focused_widget_has_priority(focused_widget))
- {
- if(focused_widget->event((GdkEvent*)event))
- return true;
- }
- else if(Gtk::Window::on_key_press_event(event))
- return true;
- else return focused_widget->event((GdkEvent*)event);
- return false;
-}
-
-bool
CanvasView::focused_widget_has_priority(Gtk::Widget * focused)
{
if(dynamic_cast<Gtk::Entry*>(focused))
diff --git a/synfig-studio/src/gui/canvasview.h
b/synfig-studio/src/gui/canvasview.h
index 70adb90..30e7a1f 100644
--- a/synfig-studio/src/gui/canvasview.h
+++ b/synfig-studio/src/gui/canvasview.h
@@ -719,7 +719,6 @@ private:
void on_meta_data_changed();
bool on_key_press_event(GdkEventKey* event);
- bool on_key_release_event(GdkEventKey* event);
bool focused_widget_has_priority(Gtk::Widget * focused);
diff --git a/synfig-studio/src/gui/docks/dockdialog.cpp
b/synfig-studio/src/gui/docks/dockdialog.cpp
index c73a123..68e4fc8 100644
--- a/synfig-studio/src/gui/docks/dockdialog.cpp
+++ b/synfig-studio/src/gui/docks/dockdialog.cpp
@@ -262,21 +262,6 @@ DockDialog::on_key_press_event(GdkEventKey* event)
}
bool
-DockDialog::on_key_release_event(GdkEventKey* event)
-{
- Gtk::Widget* focused_widget = get_focus();
- if(focused_widget_has_priority(focused_widget))
- {
- if(focused_widget->event((GdkEvent*)event))
- return true;
- }
- else if(Gtk::Window::on_key_press_event(event))
- return true;
- else return focused_widget->event((GdkEvent*)event);
- return false;
-}
-
-bool
DockDialog::focused_widget_has_priority(Gtk::Widget * focused)
{
if(dynamic_cast<Gtk::Entry*>(focused))
diff --git a/synfig-studio/src/gui/docks/dockdialog.h
b/synfig-studio/src/gui/docks/dockdialog.h
index 507eaec..3abc2ce 100644
--- a/synfig-studio/src/gui/docks/dockdialog.h
+++ b/synfig-studio/src/gui/docks/dockdialog.h
@@ -95,7 +95,6 @@ private:
void drop_on_prepend(const Glib::RefPtr<Gdk::DragContext>& context,
int, int, const Gtk::SelectionData& selection_data, guint, guint time);
bool on_key_press_event(GdkEventKey* event);
- bool on_key_release_event(GdkEventKey* event);
bool focused_widget_has_priority(Gtk::Widget* focused);
diff --git a/synfig-studio/src/gui/toolbox.cpp
b/synfig-studio/src/gui/toolbox.cpp
index 7185551..30f4019 100644
--- a/synfig-studio/src/gui/toolbox.cpp
+++ b/synfig-studio/src/gui/toolbox.cpp
@@ -648,21 +648,6 @@ Toolbox::on_key_press_event(GdkEventKey* event)
}
bool
-Toolbox::on_key_release_event(GdkEventKey* event)
-{
- Gtk::Widget* focused_widget = get_focus();
- if(focused_widget_has_priority(focused_widget))
- {
- if(focused_widget->event((GdkEvent*)event))
- return true;
- }
- else if(Gtk::Window::on_key_press_event(event))
- return true;
- else return focused_widget->event((GdkEvent*)event);
- return false;
-}
-
-bool
Toolbox::focused_widget_has_priority(Gtk::Widget * focused)
{
if(dynamic_cast<Gtk::Entry*>(focused))
diff --git a/synfig-studio/src/gui/toolbox.h b/synfig-studio/src/gui/toolbox.h
index a6c0ab7..102633c 100644
--- a/synfig-studio/src/gui/toolbox.h
+++ b/synfig-studio/src/gui/toolbox.h
@@ -78,7 +78,6 @@ class Toolbox : public Gtk::Window
void on_recent_files_changed();
void on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>&
context, int x, int y, const Gtk::SelectionData& selection_data, guint info,
guint time);
bool on_key_press_event(GdkEventKey* event);
- bool on_key_release_event(GdkEventKey* event);
bool focused_widget_has_priority(Gtk::Widget * focused);
void change_state_(const Smach::state_base *state);
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
