diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index 45a02b2656..5885b8572f 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -1429,18 +1429,6 @@ void gfx_display_set_height(unsigned height) p_disp->framebuf_height = height; } -void gfx_display_set_header_height(unsigned height) -{ - gfx_display_t *p_disp = disp_get_ptr(); - p_disp->header_height = height; -} - -unsigned gfx_display_get_header_height(void) -{ - gfx_display_t *p_disp = disp_get_ptr(); - return p_disp->header_height; -} - void gfx_display_set_framebuffer_pitch(size_t pitch) { gfx_display_t *p_disp = disp_get_ptr(); diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h index 8699459cea..765b8ac3ae 100644 --- a/gfx/gfx_display.h +++ b/gfx/gfx_display.h @@ -259,8 +259,6 @@ void gfx_display_set_width(unsigned width); void gfx_display_get_fb_size(unsigned *fb_width, unsigned *fb_height, size_t *fb_pitch); void gfx_display_set_height(unsigned height); -void gfx_display_set_header_height(unsigned height); -unsigned gfx_display_get_header_height(void); void gfx_display_set_framebuffer_pitch(size_t pitch); bool gfx_display_get_msg_force(void); diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index bc9126e5a6..e9655b364c 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -2989,7 +2989,8 @@ static float materialui_get_scroll(materialui_handle_t *mui) file_list_t *list = menu_entries_get_selection_buf_ptr(0); materialui_node_t *node = NULL; size_t selection = menu_navigation_get_selection(); - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; unsigned width = 0; unsigned height = 0; float view_centre = 0.0f; @@ -3430,10 +3431,11 @@ static void materialui_render(void *data, float scale_factor; settings_t *settings = config_get_ptr(); materialui_handle_t *mui = (materialui_handle_t*)data; - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); size_t entries_end = menu_entries_get_size(); size_t selection = menu_navigation_get_selection(); file_list_t *list = menu_entries_get_selection_buf_ptr(0); + unsigned header_height = p_disp->header_height; bool first_entry_found = false; bool last_entry_found = false; unsigned landscape_layout_optimization @@ -4909,8 +4911,9 @@ static void materialui_render_menu_list( size_t last_entry; file_list_t *list = NULL; size_t entries_end = menu_entries_get_size(); - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); size_t selection = menu_navigation_get_selection(); + unsigned header_height = p_disp->header_height; bool touch_feedback_enabled = !mui->scrollbar.dragged && !mui->show_fullscreen_thumbnails && @@ -6586,8 +6589,9 @@ static void materialui_frame(void *data, video_frame_info_t *video_info) int list_x_offset; materialui_handle_t *mui = (materialui_handle_t*)data; settings_t *settings = config_get_ptr(); - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); size_t selection = menu_navigation_get_selection(); + unsigned header_height = p_disp->header_height; enum gfx_animation_ticker_type menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_ticker_type; bool menu_ticker_smooth = settings->bools.menu_ticker_smooth; @@ -7185,7 +7189,8 @@ static void materialui_set_thumbnail_dimensions(materialui_handle_t *mui) /* > Get total usable height * (list view height minus vertical padding * between thumbnails minus status bar height) */ - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; int usable_height = (int)mui->last_height - (int)header_height - (int)(mui->margin * 3) - (int)mui->nav_bar_layout_height - (int)mui->status_bar.height; @@ -7401,6 +7406,7 @@ static void materialui_layout(materialui_handle_t *mui, bool video_is_threaded) int list_font_size; int hint_font_size; unsigned new_header_height; + gfx_display_t *p_disp = disp_get_ptr(); mui->is_portrait = mui->last_height >= mui->last_width; @@ -7472,7 +7478,7 @@ static void materialui_layout(materialui_handle_t *mui, bool video_is_threaded) mui->font_data.list.glyph_width = (int)((list_font_size * (3.0f / 4.0f)) + 0.5f); mui->font_data.hint.glyph_width = (int)((hint_font_size * (3.0f / 4.0f)) + 0.5f); - gfx_display_set_header_height(new_header_height); + p_disp->header_height = new_header_height; if (mui->font_data.title.font) { @@ -9082,11 +9088,12 @@ static int materialui_pointer_down(void *userdata, * fullscreen thumbnails) */ if (mui->scrollbar.active && !mui->show_fullscreen_thumbnails) { - unsigned header_height = gfx_display_get_header_height(); unsigned width; unsigned height; int drag_margin_horz; int drag_margin_vert; + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; video_driver_get_size(&width, &height); @@ -9377,7 +9384,8 @@ static int materialui_pointer_up(void *userdata, { unsigned width; unsigned height; - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; size_t selection = menu_navigation_get_selection(); size_t entries_end = menu_entries_get_size(); materialui_handle_t *mui = (materialui_handle_t*)userdata; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index a6366b5f78..3d94265d3b 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -4664,6 +4664,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded) size_t start = 0; rgui_t *rgui = NULL; settings_t *settings = config_get_ptr(); + gfx_display_t *p_disp = disp_get_ptr(); unsigned aspect_ratio_lock = settings->uints.menu_rgui_aspect_ratio_lock; menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); @@ -4721,7 +4722,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded) /* Fixed 'menu display' settings */ new_font_height = FONT_HEIGHT_STRIDE * 2; - gfx_display_set_header_height(new_font_height); + p_disp->header_height = new_font_height; /* Prepare RGUI colors, to improve performance */ rgui->theme_preset_path[0] = '\0'; @@ -5353,7 +5354,8 @@ static int rgui_pointer_up(void *data, menu_entry_t *entry, unsigned action) { rgui_t *rgui = (rgui_t*)data; - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; size_t selection = menu_navigation_get_selection(); if (!rgui) diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index 01b755e396..cab3a806ad 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -3054,6 +3054,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info) static void stripes_layout_ps3(stripes_handle_t *stripes, int width, int height) { unsigned new_font_size, new_header_height; + gfx_display_t *p_disp = disp_get_ptr(); settings_t *settings = config_get_ptr(); float scale_factor = @@ -3134,12 +3135,13 @@ static void stripes_layout_ps3(stripes_handle_t *stripes, int width, int height) RARCH_LOG("[XMB] icon size: %.2f\n", stripes->icon_size); #endif - gfx_display_set_header_height(new_header_height); + p_disp->header_height = new_header_height; } static void stripes_layout_psp(stripes_handle_t *stripes, int width) { unsigned new_font_size, new_header_height; + gfx_display_t *p_disp = disp_get_ptr(); settings_t *settings = config_get_ptr(); float scale_factor = ((settings->floats.menu_scale_factor * width) / 1920.0) * 1.5; @@ -3204,7 +3206,7 @@ static void stripes_layout_psp(stripes_handle_t *stripes, int width) RARCH_LOG("[XMB] icon size: %.2f\n", stripes->icon_size); #endif - gfx_display_set_header_height(new_header_height); + p_disp->header_height = new_header_height; } static void stripes_layout(stripes_handle_t *stripes) @@ -4364,7 +4366,8 @@ static int stripes_pointer_up(void *userdata, case MENU_INPUT_GESTURE_SHORT_PRESS: { /* Normal pointer input */ - unsigned header_height = gfx_display_get_header_height(); + gfx_display_t *p_disp = disp_get_ptr(); + unsigned header_height = p_disp->header_height; if (y < header_height) return (unsigned)generic_menu_entry_action(stripes,