mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-29 00:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix borders in ColorBar

Browse Source
This commit is contained in:
David Capello 2014-04-13 13:40:33 -03:00
parent 3313735936
commit 44c9bb520d
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/widgets/main_window.xml
View File

@ -1,14 +1,14 @@
<!-- ASEPRITE --> <!-- Aseprite -->
<!-- Copyright (C) 2001-2013 by David Capello --> <!-- Copyright (C) 2001-2014 by David Capello -->
<gui> <gui>
<box noborders="true" vertical="true" id="main_box"> <vbox noborders="true" id="main_box">
<box noborders="true" horizontal="true" id="menubar" /> <hbox noborders="true" id="menubar" />
<box noborders="true" horizontal="true" id="tabsbar" /> <hbox noborders="true" id="tabsbar" />
<box noborders="true" horizontal="true" expansive="true"> <hbox noborders="true" expansive="true">
<splitter id="colorbarsplitter" <splitter id="colorbarsplitter"
horizontal="true" expansive="true" horizontal="true" expansive="true"
by="pixel" position="52"> by="pixel" position="52">
<box noborders="true" vertical="true" id="colorbar" /> <vbox noborders="true" id="colorbar" />
<vbox noborders="true" expansive="true"> <vbox noborders="true" expansive="true">
<vbox noborders="true" id="contextbar" /> <vbox noborders="true" id="contextbar" />
<splitter id="timelinesplitter" <splitter id="timelinesplitter"
@ -19,8 +19,8 @@
</splitter> </splitter>
</vbox> </vbox>
</splitter> </splitter>
<box noborders="true" vertical="true" id="toolbar" /> <vbox noborders="true" id="toolbar" />
</box> </hbox>
<box noborders="true" horizontal="true" id="statusbar" /> <hbox noborders="true" id="statusbar" />
</box> </vbox>
</gui> </gui>

10
src/app/ui/color_bar.cpp
View File

@ -82,8 +82,8 @@ ColorBar::ColorBar(int align)
{ {
m_instance = this; m_instance = this;
setBorder(gfx::Border(1*jguiscale())); setBorder(gfx::Border(2*jguiscale(), 0, 0, 0));
child_spacing = 1*jguiscale(); child_spacing = 2*jguiscale();
m_paletteView.setBoxSize(6*jguiscale()); m_paletteView.setBoxSize(6*jguiscale());
m_paletteView.setColumns(4); m_paletteView.setColumns(4);
@ -105,12 +105,6 @@ ColorBar::ColorBar(int align)
addChild(&m_fgColor); addChild(&m_fgColor);
addChild(&m_bgColor); addChild(&m_bgColor);
this->border_width.l = 2*jguiscale();
this->border_width.t = 2*jguiscale();
this->border_width.r = 0;
this->border_width.b = 2*jguiscale();
this->child_spacing = 2*jguiscale();
m_paletteView.IndexChange.connect(&ColorBar::onPaletteIndexChange, this); m_paletteView.IndexChange.connect(&ColorBar::onPaletteIndexChange, this);
m_fgColor.Change.connect(&ColorBar::onFgColorButtonChange, this); m_fgColor.Change.connect(&ColorBar::onFgColorButtonChange, this);
m_bgColor.Change.connect(&ColorBar::onBgColorButtonChange, this); m_bgColor.Change.connect(&ColorBar::onBgColorButtonChange, this);