From 143bfc9f801c84428074312d661f8e08803df83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Aug 2016 15:09:31 +0200 Subject: Imported Upstream version 0.23.5 --- src/Page.vala | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/Page.vala') diff --git a/src/Page.vala b/src/Page.vala index 2f6f2c3..4877a47 100644 --- a/src/Page.vala +++ b/src/Page.vala @@ -1267,7 +1267,7 @@ public abstract class CheckerboardPage : Page { } protected virtual string get_filter_no_match_message() { - return _("No photos/videos found"); + return _("No photos/videos found which match the current filter"); } protected virtual void on_item_activated(CheckerboardItem item, Activator activator, @@ -1471,9 +1471,14 @@ public abstract class CheckerboardPage : Page { uint state = event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK); // use clicks for multiple selection and activation only; single selects are handled by - // button release, to allow for multiple items to be selected then dragged + // button release, to allow for multiple items to be selected then dragged ... CheckerboardItem item = get_item_at_pixel(event.x, event.y); if (item != null) { + // ... however, there is no dragging if the user clicks on an interactive part of the + // CheckerboardItem (e.g. a tag) + if (layout.handle_left_click(item, event.x, event.y, event.state)) + return true; + switch (state) { case Gdk.ModifierType.CONTROL_MASK: // with only Ctrl pressed, multiple selections are possible ... chosen item @@ -1644,6 +1649,9 @@ public abstract class CheckerboardPage : Page { } protected virtual bool on_mouse_over(CheckerboardItem? item, int x, int y, Gdk.ModifierType mask) { + if (item != null) + layout.handle_mouse_motion(item, x, y, mask); + // if hovering over the last hovered item, or both are null (nothing highlighted and // hovering over empty space), do nothing if (item == highlighted) -- cgit v1.2.3