Merge lp:~larsu/ido/prelight-and-focus-scale into lp:ido/15.04

[Lars Karlitski]

idoscalemenuitem: fix scale hover state

idoscalemenuitem: fix scale hover state

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/ido-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/71/rebuild

review: Approve (continuous-integration)

[lp:~larsu/ido/prelight-and-focus-scale]

191. By Lars Karlitski on 2015-03-10

idoscalemenuitem: translate motion event coordinates

Fixes hover theming.

192. By Lars Karlitski on 2015-03-10

idoscalemenuitem: set focus flag on scale

So that it gets themed correctly when the menu item is selected.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/ido-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/72/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

looks good to me

review: Approve

[Simon Steinbeiß (ochosi)]

The changes in the code make sense to me and I've just (successfully) tested the patch.

review: Approve

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2015-01-21 18:21:23 +0000
+++ src/idoscalemenuitem.c	2015-03-10 11:39:15 +0000
@@ -472,6 +472,7 @@
   IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item);
 
   priv->has_focus = TRUE;
+  gtk_widget_set_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED, FALSE);
 
   GTK_MENU_ITEM_CLASS (ido_scale_menu_item_parent_class)->select (item);
 }
@@ -482,6 +483,7 @@
   IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item);
 
   priv->has_focus = FALSE;
+  gtk_widget_unset_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED);
 
   GTK_MENU_ITEM_CLASS (ido_scale_menu_item_parent_class)->deselect (item);
 }
@@ -574,6 +576,15 @@
   gtk_widget_get_allocation (priv->scale, &alloc);
   gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
 
+  /* don't translate coordinates when the scale has the "grab" -
+   * GtkRange expects coords relative to its event window in that case
+   */
+  if (!priv->grabbed)
+    {
+      event->x = x;
+      event->y = y;
+    }
+
   if (priv->grabbed ||
       (x > 0 && x < alloc.width && y > 0 && y < alloc.height))
     gtk_widget_event (priv->scale, (GdkEvent *) event);