mirror of
https://github.com/labwc/labwc.git
synced 2026-05-02 06:47:03 -04:00
labnag: fix details scroll button group height calculation
Previously the scroll button group height was shorter than intended as it was calculated using details.height instead of the border dimensions. Calculate button heights using border_rect_height to properly fill the bordered region.
This commit is contained in:
parent
e209de3eb1
commit
ccdef5e854
1 changed files with 6 additions and 5 deletions
|
|
@ -375,7 +375,7 @@ render_detailed(cairo_t *cairo, struct nag *nag, uint32_t y)
|
||||||
bool show_buttons = nag->details.offset > 0;
|
bool show_buttons = nag->details.offset > 0;
|
||||||
int button_width = get_detailed_scroll_button_width(cairo, nag);
|
int button_width = get_detailed_scroll_button_width(cairo, nag);
|
||||||
if (show_buttons) {
|
if (show_buttons) {
|
||||||
nag->details.width -= button_width;
|
nag->details.width += border - button_width;
|
||||||
pango_layout_set_width(layout,
|
pango_layout_set_width(layout,
|
||||||
(nag->details.width - padding * 2) * PANGO_SCALE);
|
(nag->details.width - padding * 2) * PANGO_SCALE);
|
||||||
}
|
}
|
||||||
|
|
@ -388,7 +388,7 @@ render_detailed(cairo_t *cairo, struct nag *nag, uint32_t y)
|
||||||
|
|
||||||
if (!show_buttons) {
|
if (!show_buttons) {
|
||||||
show_buttons = true;
|
show_buttons = true;
|
||||||
nag->details.width -= button_width;
|
nag->details.width += border - button_width;
|
||||||
pango_layout_set_width(layout,
|
pango_layout_set_width(layout,
|
||||||
(nag->details.width - padding * 2) * PANGO_SCALE);
|
(nag->details.width - padding * 2) * PANGO_SCALE);
|
||||||
}
|
}
|
||||||
|
|
@ -408,16 +408,17 @@ render_detailed(cairo_t *cairo, struct nag *nag, uint32_t y)
|
||||||
|
|
||||||
if (show_buttons) {
|
if (show_buttons) {
|
||||||
nag->details.button_up.x = nag->details.x + nag->details.width;
|
nag->details.button_up.x = nag->details.x + nag->details.width;
|
||||||
nag->details.button_up.y = nag->details.y;
|
nag->details.button_up.y = nag->details.y - border;
|
||||||
nag->details.button_up.width = button_width;
|
nag->details.button_up.width = button_width;
|
||||||
nag->details.button_up.height = nag->details.height / 2;
|
nag->details.button_up.height = (border_rect_height + border) / 2;
|
||||||
render_details_scroll_button(cairo, nag, &nag->details.button_up);
|
render_details_scroll_button(cairo, nag, &nag->details.button_up);
|
||||||
|
|
||||||
nag->details.button_down.x = nag->details.x + nag->details.width;
|
nag->details.button_down.x = nag->details.x + nag->details.width;
|
||||||
nag->details.button_down.y =
|
nag->details.button_down.y =
|
||||||
nag->details.button_up.y + nag->details.button_up.height;
|
nag->details.button_up.y + nag->details.button_up.height;
|
||||||
nag->details.button_down.width = button_width;
|
nag->details.button_down.width = button_width;
|
||||||
nag->details.button_down.height = nag->details.height / 2;
|
nag->details.button_down.height =
|
||||||
|
border_rect_height - nag->details.button_up.height;
|
||||||
render_details_scroll_button(cairo, nag, &nag->details.button_down);
|
render_details_scroll_button(cairo, nag, &nag->details.button_down);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue