Date:2010-05-02 19:53:06 (7 years 6 months ago)
Author:Lars C.
Commit:7fd1ab032a11ea4f962a5d8bd0f11070e8d9321d
Message:Use a simple array instead of a hashmap for the colors.

Files: src/dirdialog.cpp (1 diff)
src/filedialog.cpp (1 diff)
src/gmenu2x.cpp (15 diffs)
src/gmenu2x.h (4 diffs)
src/inputdialog.cpp (7 diffs)
src/link.cpp (1 diff)
src/linkapp.cpp (1 diff)
src/listview.cpp (1 diff)
src/menusettingrgba.cpp (1 diff)
src/messagebox.cpp (1 diff)
src/selector.cpp (1 diff)
src/settingsdialog.cpp (1 diff)
src/wallpaperdialog.cpp (1 diff)

Change Details

src/dirdialog.cpp
9494        //Selection
9595        iY = selected-firstElement;
9696        iY = gmenu2x->skinConfInt["topBarHeight"]+1+(iY*rowHeight);
97        gmenu2x->s->box(2, iY, gmenu2x->resX-12, rowHeight-1, gmenu2x->skinConfColors["selectionBg"]);
97        gmenu2x->s->box(2, iY, gmenu2x->resX-12, rowHeight-1, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
9898
9999        //Directories
100100        gmenu2x->s->setClipRect(clipRect);
src/filedialog.cpp
8080        //Selection
8181        iY = selected-firstElement;
8282        iY = gmenu2x->skinConfInt["topBarHeight"]+1+(iY*rowHeight);
83        gmenu2x->s->box(2, iY, gmenu2x->resX-12, rowHeight-1, gmenu2x->skinConfColors["selectionBg"]);
83        gmenu2x->s->box(2, iY, gmenu2x->resX-12, rowHeight-1, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
8484
8585        beforeFileList();
8686
src/gmenu2x.cpp
171171    skinConfInt.set_deleted_key("");
172172    skinConfStr.set_empty_key(" ");
173173    skinConfStr.set_deleted_key("");
174    skinConfColors.set_empty_key(" ");
175    skinConfColors.set_deleted_key("");
176174
177175    //open2x
178176    savedVolumeMode = 0;
...... 
213211    path = "";
214212    getExePath();
215213
216#ifdef TARGET_GP2X
217    gp2x_mem = 0;
218    cx25874 = 0;
219214    batteryHandle = 0;
220215    backlightHandle = 0;
221216    usbHandle = 0;
222217    acHandle = 0;
223218
219
220#ifdef TARGET_GP2X
221    gp2x_mem = 0;
222    cx25874 = 0;
224223    gp2x_init();
225224
226225    //Fix tv-out
...... 
621620        for(ConfIntHash::iterator curr = skinConfInt.begin(); curr != endI; curr++)
622621            inf << curr->first << "=" << curr->second << endl;
623622
624        ConfRGBAHash::iterator endC = skinConfColors.end();
625        for(ConfRGBAHash::iterator curr = skinConfColors.begin(); curr != endC; curr++)
626            inf << curr->first << "=#" << hex << curr->second.r << hex << curr->second.g << hex << curr->second.b << hex << curr->second.a << endl;
623        int i;
624        for (i = 0; i < NUM_COLORS; ++i) {
625            inf << colorToString((enum color)i) << "=#" << hex << skinConfColors[i].r << hex
626                << skinConfColors[i].g << hex << skinConfColors[i].b << hex
627                << skinConfColors[i].a << endl;
628        }
627629
628630        inf.close();
629631        sync();
...... 
812814            string sectionIcon = "skin:sections/"+menu->sections[i]+".png";
813815            x = (i-menu->firstDispSection())*skinConfInt["linkWidth"]+sectionsCoordX;
814816            if (menu->selSectionIndex()==(int)i)
815                s->box(x, 0, skinConfInt["linkWidth"], skinConfInt["topBarHeight"], skinConfColors["selectionBg"]);
817                s->box(x, 0, skinConfInt["linkWidth"],
818                skinConfInt["topBarHeight"], skinConfColors[COLOR_SELECTION_BG]);
816819            x += skinConfInt["linkWidth"]/2;
817820            if (sc.exists(sectionIcon))
818821                sc[sectionIcon]->blit(s,x-16,sectionLinkPadding,32,32);
...... 
879882            helpDisplayed = ! helpDisplayed;
880883
881884        if (helpDisplayed) {
882            s->box(10,50,300,143, skinConfColors["messageBoxBg"]);
883            s->rectangle( 12,52,296,helpBoxHeight, skinConfColors["messageBoxBorder"] );
885            s->box(10,50,300,143, skinConfColors[COLOR_MESSAGE_BOX_BG]);
886            s->rectangle( 12,52,296,helpBoxHeight,
887            skinConfColors[COLOR_MESSAGE_BOX_BORDER] );
884888            s->write( font, tr["CONTROLS"], 20, 60 );
885889            s->write( font, tr["B, Stick press: Launch link / Confirm action"], 20, 80 );
886890            s->write( font, tr["L, R: Change section"], 20, 95 );
...... 
10961100
10971101    SettingsDialog sd(this,tr["Skin"]);
10981102    sd.addSetting(new MenuSettingMultiString(this,tr["Skin"],tr["Set the skin used by GMenu2X"],&confStr["skin"],&fl_sk.directories));
1099    sd.addSetting(new MenuSettingRGBA(this,tr["Top Bar Color"],tr["Color of the top bar"],&skinConfColors["topBarBg"]));
1100    sd.addSetting(new MenuSettingRGBA(this,tr["Bottom Bar Color"],tr["Color of the bottom bar"],&skinConfColors["bottomBarBg"]));
1101    sd.addSetting(new MenuSettingRGBA(this,tr["Selection Color"],tr["Color of the selection and other interface details"],&skinConfColors["selectionBg"]));
1102    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Color"],tr["Background color of the message box"],&skinConfColors["messageBoxBg"]));
1103    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Border Color"],tr["Border color of the message box"],&skinConfColors["messageBoxBorder"]));
1104    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Selection Color"],tr["Color of the selection of the message box"],&skinConfColors["messageBoxSelection"]));
1103    sd.addSetting(new MenuSettingRGBA(this,tr["Top Bar Color"],tr["Color of the top bar"],&skinConfColors[COLOR_TOP_BAR_BG]));
1104    sd.addSetting(new MenuSettingRGBA(this,tr["Bottom Bar Color"],tr["Color of the bottom bar"],&skinConfColors[COLOR_BOTTOM_BAR_BG]));
1105    sd.addSetting(new MenuSettingRGBA(this,tr["Selection Color"],tr["Color of the selection and other interface details"],&skinConfColors[COLOR_SELECTION_BG]));
1106    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Color"],tr["Background color of the message box"],&skinConfColors[COLOR_MESSAGE_BOX_BG]));
1107    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Border Color"],tr["Border color of the message box"],&skinConfColors[COLOR_MESSAGE_BOX_BORDER]));
1108    sd.addSetting(new MenuSettingRGBA(this,tr["Message Box Selection Color"],tr["Color of the selection of the message box"],&skinConfColors[COLOR_MESSAGE_BOX_SELECTION]));
11051109
11061110    if (sd.exec() && sd.edited()) {
11071111        if (curSkin != confStr["skin"]) {
...... 
11131117    }
11141118}
11151119
1120enum color GMenu2X::stringToColor(const string &name)
1121{
1122    if (name == "topBarBg")
1123        return COLOR_TOP_BAR_BG;
1124    else if (name == "bottomBarBg")
1125        return COLOR_BOTTOM_BAR_BG;
1126    else if (name == "messageBoxBg")
1127        return COLOR_MESSAGE_BOX_BG;
1128    else if (name == "messageBoxBorder")
1129        return COLOR_MESSAGE_BOX_BORDER;
1130    else if (name == "messageBoxSelection")
1131        return COLOR_MESSAGE_BOX_SELECTION;
1132    else
1133        return (enum color)-1;
1134}
1135
1136
1137
1138const string &GMenu2X::colorToString(enum color c)
1139{
1140    static const std::string colorNames[NUM_COLORS + 1] = {
1141        "topBarBg",
1142        "bottomBarBg",
1143        "messageBoxBg",
1144        "messageBoxBorder",
1145        "messageBoxSelection",
1146        "unkown",
1147    };
1148
1149    if (c < NUM_COLORS)
1150        return colorNames[c];
1151    else
1152        return colorNames[NUM_COLORS];
1153}
1154
1155
11161156void GMenu2X::toggleTvOut() {
11171157#ifdef TARGET_GP2X
11181158/* if (cx25874!=0)
...... 
11261166    confStr["skin"] = skin;
11271167
11281168    //Clear previous skin settings
1129    skinConfColors.clear();
11301169    skinConfStr.clear();
11311170    skinConfInt.clear();
11321171
...... 
11351174    sc.setSkin(skin);
11361175
11371176    //reset colors to the default values
1138    skinConfColors["topBarBg"] = (RGBAColor){255,255,255,130};
1139    skinConfColors["bottomBarBg"] = (RGBAColor){255,255,255,130};
1140    skinConfColors["selectionBg"] = (RGBAColor){255,255,255,130};
1141    skinConfColors["messageBoxBg"] = (RGBAColor){255,255,255,255};
1142    skinConfColors["messageBoxBorder"] = (RGBAColor){80,80,80,255};
1143    skinConfColors["messageBoxSelection"] = (RGBAColor){160,160,160,255};
1177    skinConfColors[COLOR_TOP_BAR_BG] = (RGBAColor){255,255,255,130};
1178    skinConfColors[COLOR_BOTTOM_BAR_BG] = (RGBAColor){255,255,255,130};
1179    skinConfColors[COLOR_SELECTION_BG] = (RGBAColor){255,255,255,130};
1180    skinConfColors[COLOR_MESSAGE_BOX_BG] = (RGBAColor){255,255,255,255};
1181    skinConfColors[COLOR_MESSAGE_BOX_BORDER] = (RGBAColor){80,80,80,255};
1182    skinConfColors[COLOR_MESSAGE_BOX_SELECTION] = (RGBAColor){160,160,160,255};
11441183
11451184    //load skin settings
11461185    string skinconfname = "skins/"+skin+"/skin.conf";
...... 
11591198                    if (value.length()>1 && value.at(0)=='"' && value.at(value.length()-1)=='"')
11601199                        skinConfStr[name] = value.substr(1,value.length()-2);
11611200                    else if (value.at(0) == '#')
1162                        skinConfColors[name] = strtorgba( value.substr(1,value.length()) );
1201                        skinConfColors[stringToColor(name)] = strtorgba( value.substr(1,value.length()) );
11631202                    else
11641203                        skinConfInt[name] = atoi(value.c_str());
11651204                }
...... 
12901329
12911330        if (fadeAlpha<200) fadeAlpha = intTransition(0,200,tickStart,500,tickNow);
12921331        s->box(0, 0, resX, resY, 0,0,0,fadeAlpha);
1293        s->box(box.x, box.y, box.w, box.h, skinConfColors["messageBoxBg"]);
1294        s->rectangle( box.x+2, box.y+2, box.w-4, box.h-4, skinConfColors["messageBoxBorder"] );
1332        s->box(box.x, box.y, box.w, box.h, skinConfColors[COLOR_MESSAGE_BOX_BG]);
1333        s->rectangle( box.x+2, box.y+2, box.w-4, box.h-4, skinConfColors[COLOR_MESSAGE_BOX_BORDER] );
12951334
12961335
12971336        //draw selection rect
1298        s->box( selbox.x, selbox.y, selbox.w, selbox.h, skinConfColors["messageBoxSelection"] );
1337        s->box( selbox.x, selbox.y, selbox.w, selbox.h, skinConfColors[COLOR_MESSAGE_BOX_SELECTION] );
12991338        for (i=0; i<voices.size(); i++)
13001339            s->write( font, voices[i].text, box.x+12, box.y+h2+5+(h+2)*i, SFontHAlignLeft, SFontVAlignMiddle );
13011340        s->flip();
...... 
19091948void GMenu2X::drawScrollBar(uint pagesize, uint totalsize, uint pagepos, uint top, uint height) {
19101949    if (totalsize<=pagesize) return;
19111950
1912    s->rectangle(resX-8, top, 7, height, skinConfColors["selectionBg"]);
1951    s->rectangle(resX-8, top, 7, height, skinConfColors[COLOR_SELECTION_BG]);
19131952
19141953    //internal bar total height = height-2
19151954    //bar size
...... 
19201959    if (by+bs>top+height-2) by = top+height-2-bs;
19211960
19221961
1923    s->box(resX-6, by, 3, bs, skinConfColors["selectionBg"]);
1962    s->box(resX-6, by, 3, bs, skinConfColors[COLOR_SELECTION_BG]);
19241963}
19251964
19261965void GMenu2X::drawTitleIcon(const string &icon, bool skinRes, Surface *s) {
...... 
19571996    if (bar != NULL)
19581997        bar->blit(s, 0, 0);
19591998    else
1960        s->box(0, 0, resX, skinConfInt["topBarHeight"], skinConfColors["topBarBg"]);
1999        s->box(0, 0, resX, skinConfInt["topBarHeight"],
2000        skinConfColors[COLOR_TOP_BAR_BG]);
19612001}
19622002
19632003void GMenu2X::drawBottomBar(Surface *s) {
...... 
19672007    if (bar != NULL)
19682008        bar->blit(s, 0, resY-bar->raw->h);
19692009    else
1970        s->box(0, resY-20, resX, 20, skinConfColors["bottomBarBg"]);
2010        s->box(0, resY-20, resX, 20, skinConfColors[COLOR_BOTTOM_BAR_BG]);
19712011}
src/gmenu2x.h
4747
4848extern void jz_cpuspeed(unsigned clockspeed);
4949
50enum color {
51    COLOR_TOP_BAR_BG,
52    COLOR_BOTTOM_BAR_BG,
53    COLOR_SELECTION_BG,
54    COLOR_MESSAGE_BOX_BG,
55    COLOR_MESSAGE_BOX_BORDER,
56    COLOR_MESSAGE_BOX_SELECTION,
57
58    NUM_COLORS,
59};
60
5061using std::string;
5162using fastdelegate::FastDelegate0;
5263using google::dense_hash_map;
...... 
5465typedef FastDelegate0<> MenuAction;
5566typedef dense_hash_map<string, string, hash<string> > ConfStrHash;
5667typedef dense_hash_map<string, int, hash<string> > ConfIntHash;
57typedef dense_hash_map<string, RGBAColor, hash<string> > ConfRGBAHash;
5868
5969typedef struct {
6070    unsigned short batt;
...... 
129139    void gp2x_deinit();
130140    void toggleTvOut();
131141
142    enum color stringToColor(const string &name);
143    const string &colorToString(enum color);
144
132145public:
133146    GMenu2X(int argc, char *argv[]);
134147    ~GMenu2X();
...... 
154167    //Configuration hashes
155168    ConfStrHash confStr, skinConfStr;
156169    ConfIntHash confInt, skinConfInt;
157    ConfRGBAHash skinConfColors;
170    RGBAColor skinConfColors[NUM_COLORS];
158171
159172    //Configuration settings
160173    bool useSelectionPng;
src/inputdialog.cpp
141141
142142        box.w = gmenu2x->font->getTextWidth(input)+18;
143143        box.x = 160-box.w/2;
144        gmenu2x->s->box(box.x, box.y, box.w, box.h, gmenu2x->skinConfColors["selectionBg"]);
145        gmenu2x->s->rectangle(box.x, box.y, box.w, box.h, gmenu2x->skinConfColors["selectionBg"]);
144        gmenu2x->s->box(box.x, box.y, box.w, box.h,
145        gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
146        gmenu2x->s->rectangle(box.x, box.y, box.w, box.h, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
146147
147148        gmenu2x->s->write(gmenu2x->font, input, box.x+5, box.y+box.h-2, SFontHAlignLeft, SFontVAlignBottom);
148149
...... 
152153            caretTick = curTick;
153154        }
154155
155        if (caretOn) gmenu2x->s->box(box.x+box.w-12, box.y+3, 8, box.h-6, gmenu2x->skinConfColors["selectionBg"]);
156        if (caretOn) gmenu2x->s->box(box.x+box.w-12, box.y+3, 8, box.h-6, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
156157
157158        if (gmenu2x->f200) gmenu2x->ts.poll();
158159        action = drawVirtualKeyboard();
...... 
235236    int action = ID_NO_ACTION;
236237
237238    //keyboard border
238    gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors["selectionBg"]);
239    gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
239240
240241    if (selCol<0) selCol = selRow==(int)kb->size() ? 1 : kbLength-1;
241242    if (selCol>=(int)kbLength) selCol = 0;
...... 
244245
245246    //selection
246247    if (selRow<(int)kb->size())
247        gmenu2x->s->box(kbLeft+selCol*KEY_WIDTH-1, KB_TOP+selRow*KEY_HEIGHT, KEY_WIDTH-1, KEY_HEIGHT-2, gmenu2x->skinConfColors["selectionBg"]);
248        gmenu2x->s->box(kbLeft+selCol*KEY_WIDTH-1, KB_TOP+selRow*KEY_HEIGHT, KEY_WIDTH-1, KEY_HEIGHT-2, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
248249    else {
249250        if (selCol>1) selCol = 0;
250251        if (selCol<0) selCol = 1;
251        gmenu2x->s->box(kbLeft+selCol*kbLength*KEY_WIDTH/2-1, KB_TOP+kb->size()*KEY_HEIGHT, kbLength*KEY_WIDTH/2-1, KEY_HEIGHT-1, gmenu2x->skinConfColors["selectionBg"]);
252        gmenu2x->s->box(kbLeft+selCol*kbLength*KEY_WIDTH/2-1,
253        KB_TOP+kb->size()*KEY_HEIGHT, kbLength*KEY_WIDTH/2-1, KEY_HEIGHT-1, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
252254    }
253255
254256    //keys
...... 
271273                selRow = l;
272274            }
273275
274            gmenu2x->s->rectangle(re, gmenu2x->skinConfColors["selectionBg"]);
276            gmenu2x->s->rectangle(re, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
275277            gmenu2x->s->write(gmenu2x->font, charX, kbLeft+xc*KEY_WIDTH+KEY_WIDTH/2-1, KB_TOP+l*KEY_HEIGHT+KEY_HEIGHT/2, SFontHAlignCenter, SFontVAlignMiddle);
276278            xc++;
277279        }
...... 
279281
280282    //Ok/Cancel
281283    SDL_Rect re = {kbLeft-1, KB_TOP+kb->size()*KEY_HEIGHT, kbLength*KEY_WIDTH/2-1, KEY_HEIGHT-1};
282    gmenu2x->s->rectangle(re, gmenu2x->skinConfColors["selectionBg"]);
284    gmenu2x->s->rectangle(re, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
283285    if (gmenu2x->f200 && gmenu2x->ts.pressed() && gmenu2x->ts.inRect(re)) {
284286        selCol = 0;
285287        selRow = kb->size();
...... 
287289    gmenu2x->s->write(gmenu2x->font, gmenu2x->tr["Cancel"], (int)(160-kbLength*KEY_WIDTH/4), KB_TOP+kb->size()*KEY_HEIGHT+KEY_HEIGHT/2, SFontHAlignCenter, SFontVAlignMiddle);
288290
289291    re.x = kbLeft+kbLength*KEY_WIDTH/2-1;
290    gmenu2x->s->rectangle(re, gmenu2x->skinConfColors["selectionBg"]);
292    gmenu2x->s->rectangle(re, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
291293    if (gmenu2x->f200 && gmenu2x->ts.pressed() && gmenu2x->ts.inRect(re)) {
292294        selCol = 1;
293295        selRow = kb->size();
src/link.cpp
4848    if (gmenu2x->useSelectionPng)
4949        gmenu2x->sc["imgs/selection.png"]->blit(gmenu2x->s,rect,SFontHAlignCenter,SFontVAlignMiddle);
5050    else
51        gmenu2x->s->box(rect.x, rect.y, rect.w, rect.h, gmenu2x->skinConfColors["selectionBg"]);
51        gmenu2x->s->box(rect.x, rect.y, rect.w, rect.h, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
5252    return true;
5353}
5454
src/linkapp.cpp
264264    int halfBoxW = boxW/2;
265265
266266    //outer box
267    gmenu2x->s->box(gmenu2x->halfX-2-halfBoxW, gmenu2x->halfY-23, halfBoxW*2+5, 47, gmenu2x->skinConfColors["messageBoxBg"]);
267    gmenu2x->s->box(gmenu2x->halfX-2-halfBoxW, gmenu2x->halfY-23, halfBoxW*2+5, 47, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BG]);
268268    //inner rectangle
269    gmenu2x->s->rectangle(gmenu2x->halfX-halfBoxW, gmenu2x->halfY-21, boxW, 42, gmenu2x->skinConfColors["messageBoxBorder"]);
269    gmenu2x->s->rectangle(gmenu2x->halfX-halfBoxW, gmenu2x->halfY-21, boxW, 42, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BORDER]);
270270
271271    int x = gmenu2x->halfX+10-halfBoxW;
272272    /*if (getIcon()!="")
src/listview.cpp
5353    int iY = selectedItem-firstDisplayItem;
5454    iY = rect.y+(iY*16);
5555    if (selectedItem<(int)items.size())
56        gmenu2x->s->box(1, iY, 309, 14, gmenu2x->skinConfColors["selectionBg"]);
56        gmenu2x->s->box(1, iY, 309, 14, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
5757
5858    //Items
5959    iY = rect.y;
src/menusettingrgba.cpp
155155
156156void MenuSettingRGBA::drawSelected(int y) {
157157    int x = 166+selPart*36;
158    gmenu2x->s->box( x, y, 36, 14, gmenu2x->skinConfColors["selectionBg"] );
158    gmenu2x->s->box( x, y, 36, 14, gmenu2x->skinConfColors[COLOR_SELECTION_BG] );
159159
160160    gmenu2x->drawButton(btnDec,
161161    gmenu2x->drawButton(btnInc,
src/messagebox.cpp
7373    box.y = gmenu2x->halfY - box.h/2 -2;
7474
7575    //outer box
76    bg.box(box, gmenu2x->skinConfColors["messageBoxBg"]);
76    bg.box(box, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BG]);
7777    //draw inner rectangle
78    bg.rectangle(box.x+2, box.y+2, box.w-4, box.h-gmenu2x->font->getHeight(), gmenu2x->skinConfColors["messageBoxBorder"]);
78    bg.rectangle(box.x+2, box.y+2, box.w-4, box.h-gmenu2x->font->getHeight(),
79    gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BORDER]);
7980    //icon+text
8081    if (gmenu2x->sc[icon] != NULL)
8182        gmenu2x->sc[icon]->blitCenter( &bg, box.x+25, box.y+gmenu2x->font->getHeight()+3 );
src/selector.cpp
8787        iY = selected-firstElement;
8888        iY = 42+(iY*16);
8989        if (selected<fl.size())
90            gmenu2x->s->box(1, iY, 309, 14, gmenu2x->skinConfColors["selectionBg"]);
90            gmenu2x->s->box(1, iY, 309, 14, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
9191
9292        //Screenshot
9393        if (selected-fl.dirCount()<screens.size() && screens[selected-fl.dirCount()]!="") {
src/settingsdialog.cpp
7373        iY = gmenu2x->skinConfInt["topBarHeight"]+2+(iY*rowHeight);
7474        gmenu2x->s->setClipRect(clipRect);
7575        if (sel<voices.size())
76            gmenu2x->s->box(1, iY, 148, rowHeight-2, gmenu2x->skinConfColors["selectionBg"]);
76            gmenu2x->s->box(1, iY, 148, rowHeight-2, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
7777        gmenu2x->s->clearClipRect();
7878
7979        //selected option
src/wallpaperdialog.cpp
7070        //Selection
7171        iY = selected-firstElement;
7272        iY = 44+(iY*17);
73        gmenu2x->s->box(2, iY, 308, 16, gmenu2x->skinConfColors["selectionBg"]);
73        gmenu2x->s->box(2, iY, 308, 16, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
7474
7575        //Files & Directories
7676        gmenu2x->s->setClipRect(0,41,311,179);

Archive Download the corresponding diff file



interactive