Skip to content

Commit 4c6011c

Browse files
committed
DisplayOptions: flip function bar buttons to Dec and Inc
as per @Explorer09's suggestion in #745. Also makes it consistent with "- Nice" and "+ Nice" in the main function bar!
1 parent 08ee160 commit 4c6011c

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

DisplayOptionsPanel.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ in the source distribution for its full text.
2424

2525
static const char* const DisplayOptionsFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL};
2626

27-
static const char* const DisplayOptionsIncDecFunctions[] = {"Inc ", "Dec ", " ", "Done ", NULL};
28-
static const char* const DisplayOptionsIncDecKeys[] = {"+ ", "- ", " ", "F10", NULL};
29-
static const int DisplayOptionsIncDecEvents[] = {'+', '-', ERR, KEY_F(10)};
27+
static const char* const DisplayOptionsDecIncFunctions[] = {"Dec ", "Inc ", " ", "Done ", NULL};
28+
static const char* const DisplayOptionsDecIncKeys[] = {"- ", "+ ", " ", "F10", NULL};
29+
static const int DisplayOptionsDecIncEvents[] = {'-', '+', ERR, KEY_F(10)};
3030

3131
static void DisplayOptionsPanel_delete(Object* object) {
3232
Panel* super = (Panel*) object;
3333
DisplayOptionsPanel* this = (DisplayOptionsPanel*) object;
34-
FunctionBar_delete(this->incDecBar);
34+
FunctionBar_delete(this->decIncBar);
3535
Panel_done(super);
3636
free(this);
3737
}
@@ -95,7 +95,7 @@ static HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) {
9595
/* fallthrough */
9696
case EVENT_SET_SELECTED:
9797
if (OptionItem_kind(selected) == OPTION_ITEM_NUMBER) {
98-
super->currentBar = this->incDecBar;
98+
super->currentBar = this->decIncBar;
9999
} else {
100100
Panel_setDefaultBar(super);
101101
}
@@ -131,7 +131,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
131131
FunctionBar* fuBar = FunctionBar_new(DisplayOptionsFunctions, NULL, NULL);
132132
Panel_init(super, 1, 1, 1, 1, Class(OptionItem), true, fuBar);
133133

134-
this->incDecBar = FunctionBar_new(DisplayOptionsIncDecFunctions, DisplayOptionsIncDecKeys, DisplayOptionsIncDecEvents);
134+
this->decIncBar = FunctionBar_new(DisplayOptionsDecIncFunctions, DisplayOptionsDecIncKeys, DisplayOptionsDecIncEvents);
135135
this->settings = settings;
136136
this->scr = scr;
137137

DisplayOptionsPanel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ typedef struct DisplayOptionsPanel_ {
1818

1919
Settings* settings;
2020
ScreenManager* scr;
21-
FunctionBar* incDecBar;
21+
FunctionBar* decIncBar;
2222
} DisplayOptionsPanel;
2323

2424
extern const PanelClass DisplayOptionsPanel_class;

0 commit comments

Comments
 (0)