From 44c9bb520d5fb6fca4bad7ae6bf18ef3a60a4482 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sun, 13 Apr 2014 13:40:33 -0300
Subject: [PATCH] Fix borders in ColorBar

---
 data/widgets/main_window.xml | 22 +++++++++++-----------
 src/app/ui/color_bar.cpp     | 10 ++--------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/data/widgets/main_window.xml b/data/widgets/main_window.xml
index 08f3f07e8..c53ab2d15 100644
--- a/data/widgets/main_window.xml
+++ b/data/widgets/main_window.xml
@@ -1,14 +1,14 @@
-<!-- ASEPRITE -->
-<!-- Copyright (C) 2001-2013 by David Capello -->
+<!-- Aseprite -->
+<!-- Copyright (C) 2001-2014 by David Capello -->
 <gui>
-  <box noborders="true" vertical="true" id="main_box">
-    <box noborders="true" horizontal="true" id="menubar" />
-    <box noborders="true" horizontal="true" id="tabsbar" />
-    <box noborders="true" horizontal="true" expansive="true">
+  <vbox noborders="true" id="main_box">
+    <hbox noborders="true" id="menubar" />
+    <hbox noborders="true" id="tabsbar" />
+    <hbox noborders="true" expansive="true">
       <splitter id="colorbarsplitter"
 		horizontal="true" expansive="true"
 		by="pixel" position="52">
-	<box noborders="true" vertical="true" id="colorbar" />
+	<vbox noborders="true" id="colorbar" />
 	<vbox noborders="true" expansive="true">
 	  <vbox noborders="true" id="contextbar" />
 	  <splitter id="timelinesplitter"
@@ -19,8 +19,8 @@
 	  </splitter>
 	</vbox>
       </splitter>
-      <box noborders="true" vertical="true" id="toolbar" />
-    </box>
-    <box noborders="true" horizontal="true" id="statusbar" />
-  </box>
+      <vbox noborders="true" id="toolbar" />
+    </hbox>
+    <hbox noborders="true" id="statusbar" />
+  </vbox>
 </gui>
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index b58f580a8..d61df8f7b 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -82,8 +82,8 @@ ColorBar::ColorBar(int align)
 {
   m_instance = this;
 
-  setBorder(gfx::Border(1*jguiscale()));
-  child_spacing = 1*jguiscale();
+  setBorder(gfx::Border(2*jguiscale(), 0, 0, 0));
+  child_spacing = 2*jguiscale();
 
   m_paletteView.setBoxSize(6*jguiscale());
   m_paletteView.setColumns(4);
@@ -105,12 +105,6 @@ ColorBar::ColorBar(int align)
   addChild(&m_fgColor);
   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_fgColor.Change.connect(&ColorBar::onFgColorButtonChange, this);
   m_bgColor.Change.connect(&ColorBar::onBgColorButtonChange, this);