qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 17:51:34 +02:00
Code

When editing colors, show the selected color component using its color

Browse Source 
Instead of showing 'R:', 'G:', 'B:' and 'A:', which take up a lot of space
and can overlap in standard fonts, the selection rectangle surrounding the
number is red, green, blue or gray, and the text is shorter.

This will allow the labels for the skin colors to be longer for translations
as well, given that their values are shown less wide.
This commit is contained in:
Nebuleon Fumika 2014-07-24 06:45:23 +00:00 committed by Maarten ter Huurne
parent ab27096f10
commit 1508ac87ac
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/menusettingrgba.cpp
View File

@ -30,7 +30,7 @@
using std::string; using std::string;
using std::stringstream; using std::stringstream;
constexpr unsigned int COMPONENT_WIDTH = 36; constexpr unsigned int COMPONENT_WIDTH = 28;
MenuSettingRGBA::MenuSettingRGBA( MenuSettingRGBA::MenuSettingRGBA(
GMenu2X *gmenu2x, Touchscreen &ts_, GMenu2X *gmenu2x, Touchscreen &ts_,
@ -58,10 +58,10 @@ void MenuSettingRGBA::draw(int valueX, int y, int h) {
s.rectangle(valueX, y + 1, h - 2, h - 2, 0,0,0,255); s.rectangle(valueX, y + 1, h - 2, h - 2, 0,0,0,255);
s.rectangle(valueX + 1, y + 2, h - 4, h - 4, 255,255,255,255); s.rectangle(valueX + 1, y + 2, h - 4, h - 4, 255,255,255,255);
s.box(valueX + 2, y + 3, h - 6, h - 6, value()); s.box(valueX + 2, y + 3, h - 6, h - 6, value());
gmenu2x->font->write(s, "R: "+strR, valueX + h + 3, y, Font::HAlignLeft, Font::VAlignTop); gmenu2x->font->write(s, strR, valueX + h + COMPONENT_WIDTH - 2, y, Font::HAlignRight, Font::VAlignTop);
gmenu2x->font->write(s, "G: "+strG, valueX + h + 3 + COMPONENT_WIDTH, y, Font::HAlignLeft, Font::VAlignTop); gmenu2x->font->write(s, strG, valueX + h + COMPONENT_WIDTH * 2 - 2, y, Font::HAlignRight, Font::VAlignTop);
gmenu2x->font->write(s, "B: "+strB, valueX + h + 3 + COMPONENT_WIDTH * 2, y, Font::HAlignLeft, Font::VAlignTop); gmenu2x->font->write(s, strB, valueX + h + COMPONENT_WIDTH * 3 - 2, y, Font::HAlignRight, Font::VAlignTop);
gmenu2x->font->write(s, "A: "+strA, valueX + h + 3 + COMPONENT_WIDTH * 3, y, Font::HAlignLeft, Font::VAlignTop); gmenu2x->font->write(s, strA, valueX + h + COMPONENT_WIDTH * 4 - 2, y, Font::HAlignRight, Font::VAlignTop);
} }
void MenuSettingRGBA::handleTS(int valueX, int y, int h) { void MenuSettingRGBA::handleTS(int valueX, int y, int h) {
@ -206,7 +206,15 @@ unsigned short MenuSettingRGBA::getSelPart()
void MenuSettingRGBA::drawSelected(int valueX, int y, int h) void MenuSettingRGBA::drawSelected(int valueX, int y, int h)
{ {
int x = valueX + selPart * COMPONENT_WIDTH; int x = valueX + selPart * COMPONENT_WIDTH;
gmenu2x->s->box( x + h, y, COMPONENT_WIDTH, h, gmenu2x->skinConfColors[COLOR_SELECTION_BG] ); RGBAColor color;
switch (selPart) {
default: /* fallthrough */
case 0: color = RGBAColor(255, 0, 0, 255); break;
case 1: color = RGBAColor( 0, 255, 0, 255); break;
case 2: color = RGBAColor( 0, 0, 255, 255); break;
case 3: color = RGBAColor(128, 128, 128, 255); break;
}
gmenu2x->s->box( x + h, y, COMPONENT_WIDTH, h, color );
MenuSetting::drawSelected(valueX, y, h); MenuSetting::drawSelected(valueX, y, h);
} }