mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-11-20 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ColorSliders preferred size when guiscale() > 1

Browse Source
This commit is contained in:
David Capello 2015-08-12 17:09:15 -03:00
parent bb8c238423
commit 436866c128
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,14 +11,15 @@
#include "app/color_utils.h"
#include "app/ui/color_sliders.h"
#include "base/bind.h"
#include "app/ui/skin/skin_slider_property.h"
#include "base/bind.h"
#include "ui/box.h"
#include "ui/entry.h"
#include "ui/graphics.h"
#include "ui/label.h"
#include "ui/preferred_size_event.h"
#include "ui/slider.h"
#include "ui/theme.h"
#include <climits>
@ -155,9 +156,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));
gfx::Size sz(INT_MAX, 14*guiscale());
label->setMaxSize(sz);
box->setMaxSize(sz);
entry->setMaxSize(sz);
m_grid.addChildInCell(label, 1, 1, LEFT | MIDDLE);
m_grid.addChildInCell(box, 1, 1, HORIZONTAL | VERTICAL | EXPANSIVE);