diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/buttonbar.c | 4 | ||||
-rw-r--r-- | apps/gui/color_picker.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index 02be37a198..abf1800bb2 100644 --- a/apps/gui/buttonbar.c +++ b/apps/gui/buttonbar.c | |||
@@ -46,7 +46,7 @@ void gui_buttonbar_init(struct gui_buttonbar * buttonbar) | |||
46 | { | 46 | { |
47 | viewport_set_defaults(&bb_vp[i], i); | 47 | viewport_set_defaults(&bb_vp[i], i); |
48 | bb_vp[i].font = FONT_SYSFIXED; | 48 | bb_vp[i].font = FONT_SYSFIXED; |
49 | bb_vp[i].y = screens[i].height - BUTTONBAR_HEIGHT; | 49 | bb_vp[i].y = screens[i].lcdheight - BUTTONBAR_HEIGHT; |
50 | bb_vp[i].height = BUTTONBAR_HEIGHT; | 50 | bb_vp[i].height = BUTTONBAR_HEIGHT; |
51 | bb_vp[i].drawmode = DRMODE_COMPLEMENT; | 51 | bb_vp[i].drawmode = DRMODE_COMPLEMENT; |
52 | } | 52 | } |
@@ -65,7 +65,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) | |||
65 | struct screen * display = buttonbar->display; | 65 | struct screen * display = buttonbar->display; |
66 | struct viewport vp = bb_vp[display->screen_type]; | 66 | struct viewport vp = bb_vp[display->screen_type]; |
67 | 67 | ||
68 | button_width = display->width/BUTTONBAR_MAX_BUTTONS; | 68 | button_width = display->lcdwidth/BUTTONBAR_MAX_BUTTONS; |
69 | vp.width = button_width; | 69 | vp.width = button_width; |
70 | vp.x = button_width * num; | 70 | vp.x = button_width * num; |
71 | display->set_viewport(&vp); | 71 | display->set_viewport(&vp); |
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 4ac4fa7fff..8db9ba92f5 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -360,11 +360,11 @@ static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) | |||
360 | text_top = MARGIN_TOP + display->char_height + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN; | 360 | text_top = MARGIN_TOP + display->char_height + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN; |
361 | slider_left = MARGIN_LEFT + SELECTOR_WIDTH + SELECTOR_LR_MARGIN + | 361 | slider_left = MARGIN_LEFT + SELECTOR_WIDTH + SELECTOR_LR_MARGIN + |
362 | max_label_width + SLIDER_MARGIN_LEFT; | 362 | max_label_width + SLIDER_MARGIN_LEFT; |
363 | slider_width = display->width - slider_left - SLIDER_MARGIN_RIGHT - | 363 | slider_width = display->getwidth() - slider_left - SLIDER_MARGIN_RIGHT - |
364 | display->char_width*2 - SELECTOR_LR_MARGIN - SELECTOR_WIDTH - | 364 | display->char_width*2 - SELECTOR_LR_MARGIN - SELECTOR_WIDTH - |
365 | MARGIN_RIGHT; | 365 | MARGIN_RIGHT; |
366 | display_three_rows = | 366 | display_three_rows = |
367 | display->height >= MARGIN_TOP + | 367 | display->getheight() >= MARGIN_TOP + |
368 | display->char_height*4 + /* Title + 3 sliders */ | 368 | display->char_height*4 + /* Title + 3 sliders */ |
369 | TITLE_MARGIN_BOTTOM + | 369 | TITLE_MARGIN_BOTTOM + |
370 | SELECTOR_TB_MARGIN*6 + /* 2 margins/slider */ | 370 | SELECTOR_TB_MARGIN*6 + /* 2 margins/slider */ |