summaryrefslogtreecommitdiff
path: root/src/Page.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-20 15:11:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-20 15:11:08 +0200
commitcb612a12b952e349b96d427645aaeb55d15f509a (patch)
treef29298f41d2a7ea2a976616243aca64c2c2547ce /src/Page.vala
parente7be93745e4a2ff3aa255227bef7b9d3b733aafa (diff)
parent143bfc9f801c84428074312d661f8e08803df83b (diff)
Merge tag 'upstream/0.23.5'
Upstream version 0.23.5
Diffstat (limited to 'src/Page.vala')
-rw-r--r--src/Page.vala12
1 files changed, 10 insertions, 2 deletions
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)