Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Horus : improve add widgets (#5189)

Browse source 
* Go automatically to widget setup after adding a widget

* Cosmetics
This commit is contained in:
3djc 2017-08-31 19:11:04 +02:00 • committed by Bertrand Songis
parent 5791645877
commit 8e04a6e2e4
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
radio/src/gui/480x272/screens_setup.cpp
View file

@ -35,6 +35,7 @@ Layout * currentScreen;
WidgetsContainerInterface * currentContainer; WidgetsContainerInterface * currentContainer;
Widget * currentWidget; Widget * currentWidget;
uint8_t currentZone; uint8_t currentZone;
bool widgetNeedsSettings;
#define SCREENS_SETUP_2ND_COLUMN 200 #define SCREENS_SETUP_2ND_COLUMN 200
@ -68,7 +69,7 @@ uint8_t getZoneOptionColumns(const ZoneOption * option)
} }
} }
uint8_t editColorPart(coord_t x, coord_t y, event_t event, uint8_t part, uint8_t value, LcdFlags attr, uint32_t i_flags) uint8_t editColorPart(coord_t x, coord_t y, event_t event, uint8_t part, uint8_t value, LcdFlags attr, uint32_t i_flags)
{ {
const char * STR_COLOR_PARTS = "\002" "R:" "G:" "B:"; const char * STR_COLOR_PARTS = "\002" "R:" "G:" "B:";
uint8_t PART_BITS[] = { 5, 6, 5 }; uint8_t PART_BITS[] = { 5, 6, 5 };
@ -76,9 +77,9 @@ uint8_t editColorPart(coord_t x, coord_t y, event_t event, uint8_t part, uint8_t
lcdDrawNumber(x + 20, y, value << (8-PART_BITS[part]), LEFT|TEXT_COLOR|((attr && (menuHorizontalPosition < 0 || menuHorizontalPosition == part)) ? attr : TEXT_COLOR)); lcdDrawNumber(x + 20, y, value << (8-PART_BITS[part]), LEFT|TEXT_COLOR|((attr && (menuHorizontalPosition < 0 || menuHorizontalPosition == part)) ? attr : TEXT_COLOR));
if (attr && menuHorizontalPosition == part) { if (attr && menuHorizontalPosition == part) {
value = checkIncDec(event, value, 0, (1 << PART_BITS[part])-1, i_flags); value = checkIncDec(event, value, 0, (1 << PART_BITS[part])-1, i_flags);
} }
return value; return value;
} }
bool editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue * value, LcdFlags attr, uint32_t i_flags, event_t event) bool editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue * value, LcdFlags attr, uint32_t i_flags, event_t event)
{ {
@ -267,6 +268,7 @@ bool menuWidgetChoice(event_t event)
if (previousWidget) if (previousWidget)
delete previousWidget; delete previousWidget;
currentContainer->createWidget(currentZone, *iterator); currentContainer->createWidget(currentZone, *iterator);
widgetNeedsSettings = currentContainer->getWidget(currentZone)->getFactory()->getOptions();
storageDirty(EE_MODEL); storageDirty(EE_MODEL);
} }
popMenu(); popMenu();
@ -377,6 +379,13 @@ bool menuWidgetsSetup(event_t event)
} }
} }
else { else {
if (widgetNeedsSettings) {
currentWidget = currentContainer->getWidget(menuVerticalPosition);
if (currentWidget) {
widgetNeedsSettings = false;
onZoneMenu(STR_WIDGET_SETTINGS);
}
}
lcdDrawRect(zone.x-padding, zone.y-padding, zone.w+2*padding, zone.h+2*padding, thickness, 0x3F, color); lcdDrawRect(zone.x-padding, zone.y-padding, zone.w+2*padding, zone.h+2*padding, thickness, 0x3F, color);
} }
} }