AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'usable-scales' into 'master'

Browse Source 
Usable scales

See merge request GNOME/gtk!1893
This commit is contained in:
Matthias Clasen 2020-05-13 20:06:51 +00:00
commit d1134e7616
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkpopover.c
View File

@ -1900,7 +1900,7 @@ gtk_popover_buildable_add_child (GtkBuildable *buildable,
const gchar *type)
{
if (GTK_IS_WIDGET (child))
gtk_popover_set_child (GTK_POPOVER(buildable), GTK_WIDGET (child));
gtk_popover_set_child (GTK_POPOVER (buildable), GTK_WIDGET (child));
else
parent_buildable_iface->add_child (buildable, builder, child, type);
}

8
gtk/gtkrange.c
View File

@ -1878,10 +1878,10 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture,
mouse_location = gtk_widget_pick (widget, x, y, 0);
/* For the purposes of this function, we ignore fill and highlight and
* handle them like the trough */
if (mouse_location == priv->fill_widget ||
mouse_location == priv->highlight_widget)
/* For the purposes of this function, we treat anything outside
* the slider like a click on the trough
*/
if (mouse_location != priv->slider_widget)
mouse_location = priv->trough_widget;
if (mouse_location == priv->slider_widget)