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

[GTK3] Rename subtract_margin and rectangle_inset to Inset* and swap InsetByMargin parameters for consistency.

Browse source
This commit is contained in:
trav90 2018-04-05 15:50:31 -05:00 • committed by Roy Tam
commit aa3618bdd7
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
widget/gtk/gtk3drawing.cpp
View file

@ -467,7 +467,7 @@ moz_gtk_get_widget_min_size(WidgetNodeType aGtkWidgetType, int* width,
}
static void
moz_gtk_rectangle_inset(GdkRectangle* rect, GtkBorder& aBorder)
Inset(GdkRectangle* rect, GtkBorder& aBorder)
{
MOZ_ASSERT(rect);
rect->x += aBorder.left;
@ -476,17 +476,16 @@ moz_gtk_rectangle_inset(GdkRectangle* rect, GtkBorder& aBorder)
rect->height -= aBorder.top + aBorder.bottom;
}
/* Subtracting margin is used to inset drawing of element which can have margins,
* like scrollbar, scrollbar's trough, thumb and scrollbar's button */
// Inset a rectangle by the margins specified in a style context.
static void
moz_gtk_subtract_margin(GtkStyleContext* style, GdkRectangle* rect)
InsetByMargin(GdkRectangle* rect, GtkStyleContext* style)
{
MOZ_ASSERT(rect);
GtkBorder margin;
gtk_style_context_get_margin(style, gtk_style_context_get_state(style),
&margin);
moz_gtk_rectangle_inset(rect, margin);
Inset(rect, margin);
}
static gint
@ -532,7 +531,7 @@ moz_gtk_scrollbar_button_paint(cairo_t *cr, const GdkRectangle* aRect,
if (gtk_check_version(3,20,0) == nullptr) {
// The "trough-border" is not used since GTK 3.20. The stepper margin
// box occupies the full width of the "contents" gadget content box.
moz_gtk_subtract_margin(style, &rect);
InsetByMargin(&rect, style);
} else {
// Scrollbar button has to be inset by trough_border because its DOM
// element is filling width of vertical scrollbar's track (or height
@ -605,7 +604,7 @@ moz_gtk_draw_styled_frame(GtkStyleContext* style, cairo_t *cr,
{
GdkRectangle rect = *aRect;
if (gtk_check_version(3, 6, 0) == nullptr) {
moz_gtk_subtract_margin(style, &rect);
InsetByMargin(&rect, style);
}
gtk_render_background(style, cr, rect.x, rect.y, rect.width, rect.height);
gtk_render_frame(style, cr, rect.x, rect.y, rect.width, rect.height);
@ -660,7 +659,7 @@ moz_gtk_scrollbar_thumb_paint(WidgetNodeType widget,
GdkRectangle rect = *aRect;
GtkStyleContext* style = ClaimStyleContext(widget, direction, state_flags);
moz_gtk_subtract_margin(style, &rect);
InsetByMargin(&rect, style);
gtk_render_slider(style, cr,
rect.x,
@ -1304,16 +1303,16 @@ moz_gtk_tooltip_paint(cairo_t *cr, const GdkRectangle* aRect,
rect.width -= 12;
rect.height -= 12;
moz_gtk_subtract_margin(boxStyle, &rect);
InsetByMargin(&rect, boxStyle);
gtk_render_background(boxStyle, cr, rect.x, rect.y, rect.width, rect.height);
gtk_render_frame(boxStyle, cr, rect.x, rect.y, rect.width, rect.height);
// Label drawing
GtkBorder padding, border;
gtk_style_context_get_padding(boxStyle, GTK_STATE_FLAG_NORMAL, &padding);
moz_gtk_rectangle_inset(&rect, padding);
Inset(&rect, padding);
gtk_style_context_get_border(boxStyle, GTK_STATE_FLAG_NORMAL, &border);
moz_gtk_rectangle_inset(&rect, border);
Inset(&rect, border);
GtkStyleContext* labelStyle =
CreateStyleForWidget(gtk_label_new(nullptr), boxStyle);