diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 6fd0829288..546162cb6f 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1118,8 +1118,6 @@ static void browser_render(void *data) { menu_panel->x = 0; menu_panel->y = y_increment; - menu_panel->width = 610; - menu_panel->height = 20; } #endif @@ -2578,8 +2576,6 @@ static int select_setting(uint8_t menu_type, uint64_t input) #ifdef HAVE_MENU_PANEL menu_panel->x = 0; menu_panel->y = y_increment; - menu_panel->width = 610; - menu_panel->height = 20; #endif font_parms.x = POSITION_X; diff --git a/media/xbox1/main-menu_480p.png b/media/xbox1/main-menu_480p.png index 2e2a4fe8d5..345118cef6 100644 Binary files a/media/xbox1/main-menu_480p.png and b/media/xbox1/main-menu_480p.png differ diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 54f2b6c237..ce912ed3b7 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -700,18 +700,14 @@ extern struct texture_image *menu_texture; #endif #ifdef _XBOX1 -bool texture_image_render(struct texture_image *out_img) +bool texture_image_render(struct texture_image *out_img, + int x, int y, int w, int h) { xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; if (out_img->pixels == NULL || out_img->vertex_buf == NULL) return false; - int x = out_img->x; - int y = out_img->y; - int w = out_img->width; - int h = out_img->height; - float fX = static_cast(x); float fY = static_cast(y); @@ -781,14 +777,16 @@ static inline void xdk_d3d_draw_texture(void *data) d3d->d3d_render_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE); d3d->d3d_render_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, true); - texture_image_render(menu_texture); + texture_image_render(menu_texture, menu_texture->x, menu_texture->y, + 640, 480); d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, false); } #ifdef HAVE_MENU_PANEL if ((menu_panel->x != 0) || (menu_panel->y != 0)) { - texture_image_render(menu_panel); + texture_image_render(menu_panel, menu_panel->x, menu_panel->y, + 610, 20); menu_panel->x = 0; menu_panel->y = 0; }