mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-03 21:46:20 +00:00
Remove ui::jwidget_set_border() function
This commit is contained in:
parent
ed5a2d9570
commit
3dfc07b724
@ -91,11 +91,11 @@ void AboutCommand::onExecute(Context* context)
|
||||
box1->addChild(grid);
|
||||
window->addChild(box1);
|
||||
|
||||
jwidget_set_border(close_button,
|
||||
close_button->border_width.l + 16*jguiscale(),
|
||||
close_button->border_width.t,
|
||||
close_button->border_width.r + 16*jguiscale(),
|
||||
close_button->border_width.b);
|
||||
close_button->setBorder(gfx::Border(
|
||||
close_button->border_width.l + 16*jguiscale(),
|
||||
close_button->border_width.t,
|
||||
close_button->border_width.r + 16*jguiscale(),
|
||||
close_button->border_width.b));
|
||||
|
||||
close_button->Click.connect(Bind<void>(&Window::closeWindow, window.get(), close_button));
|
||||
|
||||
|
@ -46,7 +46,7 @@ FilterTargetButtons::FilterTargetButtons(int imgtype, bool withChannels)
|
||||
{
|
||||
#define ADD(box, widget, hook) \
|
||||
if (widget) { \
|
||||
jwidget_set_border(widget, 2 * jguiscale()); \
|
||||
widget->setBorder(gfx::Border(2 * jguiscale())); \
|
||||
box->addChild(widget); \
|
||||
widget->Click.connect(Bind<void>(&FilterTargetButtons::hook, this, widget)); \
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ ColorBar::ScrollableView::ScrollableView()
|
||||
int r = theme->get_part(PART_EDITOR_SELECTED_E)->w;
|
||||
int b = theme->get_part(PART_EDITOR_SELECTED_S)->h;
|
||||
|
||||
jwidget_set_border(this, l, t, r, b);
|
||||
setBorder(gfx::Border(l, t, r, b));
|
||||
}
|
||||
|
||||
void ColorBar::ScrollableView::onPaint(ui::PaintEvent& ev)
|
||||
|
@ -48,7 +48,7 @@ EditorView::EditorView(EditorView::Type type)
|
||||
int r = theme->get_part(PART_EDITOR_SELECTED_E)->w;
|
||||
int b = theme->get_part(PART_EDITOR_SELECTED_S)->h;
|
||||
|
||||
jwidget_set_border(this, l, t, r, b);
|
||||
setBorder(gfx::Border(l, t, r, b));
|
||||
setupScrollbars();
|
||||
|
||||
UIContext::instance()->settings()->addObserver(this);
|
||||
|
@ -183,7 +183,7 @@ StatusBar::StatusBar()
|
||||
// The extra pixel in left and right borders are necessary so
|
||||
// m_commandsBox and m_movePixelsBox do not overlap the upper-left
|
||||
// and upper-right pixels drawn in onPaint() event (see putpixels)
|
||||
jwidget_set_border(this, 1*jguiscale(), 0, 1*jguiscale(), 0);
|
||||
setBorder(gfx::Border(1*jguiscale(), 0, 1*jguiscale(), 0));
|
||||
|
||||
// Construct the commands box
|
||||
{
|
||||
@ -209,7 +209,7 @@ StatusBar::StatusBar()
|
||||
m_slider->Change.connect(Bind<void>(&slider_change_hook, m_slider));
|
||||
jwidget_set_min_size(m_slider, JI_SCREEN_W/5, 0);
|
||||
|
||||
jwidget_set_border(box1, 2*jguiscale(), 1*jguiscale(), 2*jguiscale(), 2*jguiscale());
|
||||
box1->setBorder(gfx::Border(2, 1, 2, 2)*jguiscale());
|
||||
box2->noBorderNoChildSpacing();
|
||||
box3->noBorderNoChildSpacing();
|
||||
box3->setExpansive(true);
|
||||
@ -236,7 +236,7 @@ StatusBar::StatusBar()
|
||||
Box* box1 = new Box(JI_HORIZONTAL);
|
||||
Box* box2 = new Box(JI_VERTICAL);
|
||||
|
||||
jwidget_set_border(box1, 2*jguiscale(), 1*jguiscale(), 2*jguiscale(), 2*jguiscale());
|
||||
box1->setBorder(gfx::Border(2, 1, 2, 2)*jguiscale());
|
||||
box2->noBorderNoChildSpacing();
|
||||
box2->setExpansive(true);
|
||||
|
||||
|
@ -841,30 +841,6 @@ void jwidget_get_texticon_info(Widget* widget,
|
||||
SETRECT(icon);
|
||||
}
|
||||
|
||||
void jwidget_set_border(Widget* widget, int value)
|
||||
{
|
||||
ASSERT_VALID_WIDGET(widget);
|
||||
|
||||
widget->border_width.l = value;
|
||||
widget->border_width.t = value;
|
||||
widget->border_width.r = value;
|
||||
widget->border_width.b = value;
|
||||
|
||||
widget->invalidate();
|
||||
}
|
||||
|
||||
void jwidget_set_border(Widget* widget, int l, int t, int r, int b)
|
||||
{
|
||||
ASSERT_VALID_WIDGET(widget);
|
||||
|
||||
widget->border_width.l = l;
|
||||
widget->border_width.t = t;
|
||||
widget->border_width.r = r;
|
||||
widget->border_width.b = b;
|
||||
|
||||
widget->invalidate();
|
||||
}
|
||||
|
||||
void jwidget_set_min_size(Widget* widget, int w, int h)
|
||||
{
|
||||
ASSERT_VALID_WIDGET(widget);
|
||||
|
@ -51,8 +51,6 @@ namespace ui {
|
||||
gfx::Rect* icon,
|
||||
int icon_align, int icon_w, int icon_h);
|
||||
|
||||
void jwidget_set_border(Widget* widget, int value);
|
||||
void jwidget_set_border(Widget* widget, int l, int t, int r, int b);
|
||||
void jwidget_set_min_size(Widget* widget, int w, int h);
|
||||
void jwidget_set_max_size(Widget* widget, int w, int h);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user