wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-20 22:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

[GTK3] For Gtk > 3.20 determine scale trough size from trough CSS node and also add border/padding/margin

Browse source
This commit is contained in:
trav90 2018-04-06 10:37:03 -05:00 • committed by Roy Tam
commit 240fc2a6b6
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
widget/gtk/gtk3drawing.cpp
View file

@ -2500,11 +2500,11 @@ void
moz_gtk_get_scale_metrics(GtkOrientation orient, gint* scale_width, moz_gtk_get_scale_metrics(GtkOrientation orient, gint* scale_width,
gint* scale_height) gint* scale_height)
{ {
if (gtk_check_version(3, 20, 0) != nullptr) {
WidgetNodeType widget = (orient == GTK_ORIENTATION_HORIZONTAL) ? WidgetNodeType widget = (orient == GTK_ORIENTATION_HORIZONTAL) ?
MOZ_GTK_SCALE_HORIZONTAL : MOZ_GTK_SCALE_HORIZONTAL :
MOZ_GTK_SCALE_VERTICAL; MOZ_GTK_SCALE_VERTICAL;
if (gtk_check_version(3, 20, 0) != nullptr) {
gint thumb_length, thumb_height, trough_border; gint thumb_length, thumb_height, trough_border;
moz_gtk_get_scalethumb_metrics(orient, &thumb_length, &thumb_height); moz_gtk_get_scalethumb_metrics(orient, &thumb_length, &thumb_height);
@ -2520,12 +2520,10 @@ moz_gtk_get_scale_metrics(GtkOrientation orient, gint* scale_width,
} }
ReleaseStyleContext(style); ReleaseStyleContext(style);
} else { } else {
GtkStyleContext* style = ClaimStyleContext(widget); WidgetNodeType widget = (orient == GTK_ORIENTATION_HORIZONTAL) ?
gtk_style_context_get(style, gtk_style_context_get_state(style), MOZ_GTK_SCALE_TROUGH_HORIZONTAL :
"min-width", scale_width, MOZ_GTK_SCALE_TROUGH_VERTICAL;
"min-height", scale_height, moz_gtk_get_widget_min_size(widget, scale_width, scale_height);
nullptr);
ReleaseStyleContext(style);
} }
} }