diff --git a/data/skins/default/sheet.png b/data/skins/default/sheet.png index a6b8e2a8a..7c0c75efb 100644 Binary files a/data/skins/default/sheet.png and b/data/skins/default/sheet.png differ diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml index 1bec9bd90..46d50029a 100644 --- a/data/skins/default/skin.xml +++ b/data/skins/default/skin.xml @@ -209,8 +209,8 @@ - - + + diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp index 7302cb579..fa41b8973 100644 --- a/src/app/ui/color_sliders.cpp +++ b/src/app/ui/color_sliders.cpp @@ -86,6 +86,7 @@ ColorSliders::ColorSliders() , m_mode(Absolute) { addChild(&m_grid); + m_grid.setChildSpacing(0); } ColorSliders::~ColorSliders() @@ -139,6 +140,7 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in absSlider->setProperty(SkinSliderPropertyPtr(new SkinSliderProperty(new ColorSliderBgPainter(channel)))); absSlider->setDoubleBuffered(true); + get_skin_property(entry)->setLook(MiniLook); absSlider->Change.connect(Bind(&ColorSliders::onSliderChange, this, m_absSlider.size()-1)); relSlider->Change.connect(Bind(&ColorSliders::onSliderChange, this, m_relSlider.size()-1)); @@ -151,6 +153,10 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in relSlider->setExpansive(true); relSlider->setVisible(false); + label->setMaxSize(gfx::Size(INT_MAX, 14)); + box->setMaxSize(gfx::Size(INT_MAX, 14)); + entry->setMaxSize(gfx::Size(INT_MAX, 14)); + m_grid.addChildInCell(label, 1, 1, LEFT | MIDDLE); m_grid.addChildInCell(box, 1, 1, HORIZONTAL | VERTICAL | EXPANSIVE); m_grid.addChildInCell(entry, 1, 1, LEFT | MIDDLE);