mirror of
https://github.com/aseprite/aseprite.git
synced 2024-12-28 15:20:15 +00:00
Applied guiscale to tabs widget.
This commit is contained in:
parent
345dbb6fec
commit
104d315f25
@ -30,9 +30,9 @@
|
|||||||
#include "widgets/tabs.h"
|
#include "widgets/tabs.h"
|
||||||
|
|
||||||
#define CALC_TAB_WIDTH(widget, tab) \
|
#define CALC_TAB_WIDTH(widget, tab) \
|
||||||
(4 + text_length(widget->getFont(), tab->text.c_str()) + 4)
|
(4*jguiscale() + text_length(widget->getFont(), tab->text.c_str()) + 4*jguiscale())
|
||||||
|
|
||||||
#define ARROW_W 12
|
#define ARROW_W (12*jguiscale())
|
||||||
|
|
||||||
#define HAS_ARROWS ((jwidget_get_parent(tabs->button_left) == widget))
|
#define HAS_ARROWS ((jwidget_get_parent(tabs->button_left) == widget))
|
||||||
|
|
||||||
@ -231,7 +231,8 @@ static bool tabs_msg_proc(JWidget widget, JMessage msg)
|
|||||||
case JM_DRAW: {
|
case JM_DRAW: {
|
||||||
JRect rect = jwidget_get_rect(widget);
|
JRect rect = jwidget_get_rect(widget);
|
||||||
JRect box = jrect_new(rect->x1-tabs->scroll_x, rect->y1,
|
JRect box = jrect_new(rect->x1-tabs->scroll_x, rect->y1,
|
||||||
rect->x1-tabs->scroll_x+2, rect->y1+theme->get_part(PART_TAB_FILLER)->h);
|
rect->x1-tabs->scroll_x+2*jguiscale(),
|
||||||
|
rect->y1+theme->get_part(PART_TAB_FILLER)->h);
|
||||||
JLink link;
|
JLink link;
|
||||||
|
|
||||||
theme->draw_hline(box->x1, box->y1, box->x2-1, box->y2-1, PART_TAB_FILLER);
|
theme->draw_hline(box->x1, box->y1, box->x2-1, box->y2-1, PART_TAB_FILLER);
|
||||||
@ -273,7 +274,7 @@ static bool tabs_msg_proc(JWidget widget, JMessage msg)
|
|||||||
theme->draw_hline(box->x1, box->y2, box->x2-1, rect->y2-1, PART_TAB_BOTTOM_NORMAL);
|
theme->draw_hline(box->x1, box->y2, box->x2-1, rect->y2-1, PART_TAB_BOTTOM_NORMAL);
|
||||||
|
|
||||||
jdraw_text(widget->getFont(), tab->text.c_str(),
|
jdraw_text(widget->getFont(), tab->text.c_str(),
|
||||||
box->x1+4,
|
box->x1+4*jguiscale(),
|
||||||
(box->y1+box->y2)/2-text_height(widget->getFont())/2+1,
|
(box->y1+box->y2)/2-text_height(widget->getFont())/2+1,
|
||||||
text_color, face_color, false, jguiscale());
|
text_color, face_color, false, jguiscale());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user