Fine tune model select screen (#4059)

This commit is contained in:
3djc
2016-11-21 21:11:10 +01:00
committed by Bertrand Songis
parent a6bdf58619
commit 03bb622456
2 changed files with 9 additions and 9 deletions
+8 -8
View File
@@ -21,9 +21,9 @@
#include "opentx.h" #include "opentx.h"
#include "storage/modelslist.h" #include "storage/modelslist.h"
#define CATEGORIES_WIDTH 127 #define CATEGORIES_WIDTH 120
#define MODELS_LEFT 127 #define MODELS_LEFT 123
#define MODELS_COLUMN_WIDTH 170 #define MODELS_COLUMN_WIDTH 174
enum ModelSelectMode { enum ModelSelectMode {
MODE_SELECT_MODEL, MODE_SELECT_MODEL,
@@ -46,11 +46,11 @@ ModelCell * currentModel;
void drawCategory(coord_t y, const char * name, bool selected) void drawCategory(coord_t y, const char * name, bool selected)
{ {
if (selected) { if (selected) {
lcdDrawSolidFilledRect(5, y-INVERT_VERT_MARGIN, CATEGORIES_WIDTH-10, INVERT_LINE_HEIGHT+2, TEXT_INVERTED_BGCOLOR); lcdDrawSolidFilledRect(1, y-INVERT_VERT_MARGIN, CATEGORIES_WIDTH-10, INVERT_LINE_HEIGHT+2, TEXT_INVERTED_BGCOLOR);
lcdDrawText(10, y, name, TEXT_COLOR | INVERS); lcdDrawText(6, y, name, SMLSIZE | TEXT_COLOR | INVERS);
} }
else { else {
lcdDrawText(10, y, name, TEXT_COLOR); lcdDrawText(6, y, name, TEXT_COLOR);
} }
} }
@@ -437,7 +437,7 @@ bool menuModelSelect(event_t event)
for (std::list<ModelsCategory *>::iterator it = modelslist.categories.begin(); it != modelslist.categories.end(); ++it, ++index) { for (std::list<ModelsCategory *>::iterator it = modelslist.categories.begin(); it != modelslist.categories.end(); ++it, ++index) {
if (index >= categoriesVerticalOffset && index < categoriesVerticalOffset+5) { if (index >= categoriesVerticalOffset && index < categoriesVerticalOffset+5) {
if (index != categoriesVerticalOffset) { if (index != categoriesVerticalOffset) {
lcdDrawSolidHorizontalLine(5, y-4, CATEGORIES_WIDTH-10, LINE_COLOR); lcdDrawSolidHorizontalLine(1, y-4, CATEGORIES_WIDTH-10, LINE_COLOR);
} }
if (selectMode == MODE_RENAME_CATEGORY && currentCategory == *it) { if (selectMode == MODE_RENAME_CATEGORY && currentCategory == *it) {
lcdDrawSolidFilledRect(0, y-INVERT_VERT_MARGIN+1, CATEGORIES_WIDTH-2, INVERT_LINE_HEIGHT, TEXT_BGCOLOR); lcdDrawSolidFilledRect(0, y-INVERT_VERT_MARGIN+1, CATEGORIES_WIDTH-2, INVERT_LINE_HEIGHT, TEXT_BGCOLOR);
@@ -493,7 +493,7 @@ bool menuModelSelect(event_t event)
} }
} }
} }
drawVerticalScrollbar(DEFAULT_SCROLLBAR_X, 7, LCD_H - 15, menuVerticalOffset, (index + 1) / 2, 4); drawVerticalScrollbar(DEFAULT_SCROLLBAR_X + 4, 7, LCD_H - 15, menuVerticalOffset, (index + 1) / 2, 4);
// Footer // Footer
lcd->drawBitmap(5, LCD_H-FH-20, modelselSdFreeBitmap); lcd->drawBitmap(5, LCD_H-FH-20, modelselSdFreeBitmap);
+1 -1
View File
@@ -24,7 +24,7 @@
#include <list> #include <list>
#include "sdcard.h" #include "sdcard.h"
#define MODELCELL_WIDTH 166 #define MODELCELL_WIDTH 172
#define MODELCELL_HEIGHT 59 #define MODELCELL_HEIGHT 59
class ModelCell class ModelCell