From 47530bdbe69fc5b6db547c02b5bf8e41bb8aa1a0 Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 21 Sep 2015 11:53:39 -0300 Subject: [PATCH] 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 ae6c6577c..ca885b63b 100644 --- a/data/skins/default/skin.xml +++ b/data/skins/default/skin.xml @@ -17,6 +17,7 @@ + diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp index f23f9582d..220acefb0 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);