[aseprite] 61/250: Add color_slider_height dimension in skin.xml

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 47530bdbe69fc5b6db547c02b5bf8e41bb8aa1a0
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Sep 21 11:53:39 2015 -0300

    Add color_slider_height dimension in skin.xml
---
 data/skins/default/skin.xml  | 1 +
 src/app/ui/color_sliders.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml
index ae6c657..ca885b6 100644
--- a/data/skins/default/skin.xml
+++ b/data/skins/default/skin.xml
@@ -17,6 +17,7 @@
     <dim id="timeline_tags_area_height" value="4" />
     <dim id="timeline_outline_width" value="2" />
     <dim id="palette_outline_width" value="3" />
+    <dim id="color_slider_height" value="14" />
   </dimensions>
 
   <colors>
diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp
index f23f958..220acef 100644
--- a/src/app/ui/color_sliders.cpp
+++ b/src/app/ui/color_sliders.cpp
@@ -12,6 +12,7 @@
 #include "app/color_utils.h"
 #include "app/ui/color_sliders.h"
 #include "app/ui/skin/skin_slider_property.h"
+#include "app/ui/skin/skin_theme.h"
 #include "base/bind.h"
 #include "ui/box.h"
 #include "ui/entry.h"
@@ -156,7 +157,7 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in
   relSlider->setExpansive(true);
   relSlider->setVisible(false);
 
-  gfx::Size sz(INT_MAX, 14*guiscale());
+  gfx::Size sz(INT_MAX, SkinTheme::instance()->dimensions.colorSliderHeight());
   label->setMaxSize(sz);
   box->setMaxSize(sz);
   entry->setMaxSize(sz);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git