changed order of actions on search timer menu items

This commit is contained in:
louis
2014-02-07 16:18:37 +01:00
parent 51df65e90b
commit acb0580522
7 changed files with 29 additions and 27 deletions

View File

@@ -2721,13 +2721,18 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
int iconY = (height - iconSize) / 2;
std::string iconEdit, iconDelete, iconSearch;
if (active) {
iconEdit = (iconActive==0)?"edit_active":"edit_inactive";
iconDelete = (iconActive==1)?"delete_active":"delete_inactive";
iconSearch = (iconActive==2)?"search_active":"search_inactive";
iconSearch = (iconActive==0)?"search_active":"search_inactive";
iconEdit = (iconActive==1)?"edit_active":"edit_inactive";
iconDelete = (iconActive==2)?"delete_active":"delete_inactive";
} else {
iconSearch = "search_inactive";
iconEdit = "edit_inactive";
iconDelete = "delete_inactive";
iconSearch = "search_inactive";
}
cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
if (imgSearch) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
iconsX += iconSize + 10;
}
cImage *imgEdit = imgCache.GetIcon(iconEdit, iconSize, iconSize);
if (imgEdit) {
@@ -2739,11 +2744,6 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgDel);
iconsX += iconSize + 10;
}
cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
if (imgSearch) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
iconsX += iconSize + 10;
}
return iconsX;
}