mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gfx_widgets) scale_enable can b set to false for widgets, scale_factor was always 1.0f

Browse Source 
(XMB) set scale_enable to false when scale_factor is 1.0f
This commit is contained in:
libretroadmin 2022-07-05 14:18:20 +02:00
parent 681e1dea94
commit 1798651041
8 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/gfx_widgets.c
View File

@ -609,7 +609,7 @@ void gfx_widgets_draw_icon(
unsigned icon_height, unsigned icon_height,
uintptr_t texture, uintptr_t texture,
float x, float y, float x, float y,
float rotation, float scale_factor, float rotation,
float *color) float *color)
{ {
gfx_display_ctx_rotate_draw_t rotate_draw; gfx_display_ctx_rotate_draw_t rotate_draw;
@ -624,10 +624,10 @@ void gfx_widgets_draw_icon(
rotate_draw.matrix = &mymat; rotate_draw.matrix = &mymat;
rotate_draw.rotation = rotation; rotate_draw.rotation = rotation;
rotate_draw.scale_x = scale_factor; rotate_draw.scale_x = 1.0f;
rotate_draw.scale_y = scale_factor; rotate_draw.scale_y = 1.0f;
rotate_draw.scale_z = 1.0f; rotate_draw.scale_z = 1.0f;
rotate_draw.scale_enable = true; rotate_draw.scale_enable = false;
gfx_display_rotate_z(p_disp, &rotate_draw, userdata); gfx_display_rotate_z(p_disp, &rotate_draw, userdata);
@ -641,7 +641,7 @@ void gfx_widgets_draw_icon(
draw.y = video_height - y - icon_height; draw.y = video_height - y - icon_height;
draw.width = icon_width; draw.width = icon_width;
draw.height = icon_height; draw.height = icon_height;
draw.scale_factor = scale_factor; draw.scale_factor = 1.0f;
draw.rotation = rotation; draw.rotation = rotation;
draw.coords = &coords; draw.coords = &coords;
draw.matrix_data = &mymat; draw.matrix_data = &mymat;
@ -1108,7 +1108,7 @@ static int gfx_widgets_draw_indicator(
video_height, video_height,
width, height, width, height,
icon, top_right_x_advance - width, y, icon, top_right_x_advance - width, y,
0, 1, 0,
p_dispwidget->pure_white p_dispwidget->pure_white
); );
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
@ -1272,7 +1272,6 @@ static void gfx_widgets_draw_task_msg(
p_dispwidget->msg_queue_task_hourglass_x, p_dispwidget->msg_queue_task_hourglass_x,
video_height - msg->offset_y, video_height - msg->offset_y,
msg->task_finished ? 0 : msg->hourglass_rotation, msg->task_finished ? 0 : msg->hourglass_rotation,
1,
p_dispwidget->pure_white); p_dispwidget->pure_white);
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
dispctx->blend_end(userdata); dispctx->blend_end(userdata);
@ -1456,7 +1455,6 @@ static void gfx_widgets_draw_regular_msg(
p_dispwidget->msg_queue_spacing, p_dispwidget->msg_queue_spacing,
video_height - msg->offset_y - p_dispwidget->msg_queue_icon_offset_y, video_height - msg->offset_y - p_dispwidget->msg_queue_icon_offset_y,
0, 0,
1,
msg_queue_info); msg_queue_info);
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
@ -1538,7 +1536,6 @@ void gfx_widgets_frame(void *data)
0, 0,
0, 0,
0, 0,
1,
p_dispwidget->pure_white p_dispwidget->pure_white
); );
if (dispctx->blend_end) if (dispctx->blend_end)

2
gfx/gfx_widgets.h
View File

@ -286,7 +286,7 @@ void gfx_widgets_draw_icon(
unsigned icon_height, unsigned icon_height,
uintptr_t texture, uintptr_t texture,
float x, float y, float x, float y,
float rotation, float scale_factor, float rotation,
float *color); float *color);
void gfx_widgets_draw_text( void gfx_widgets_draw_text(

6
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -176,7 +176,7 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
MENU_WIDGETS_ICON_ACHIEVEMENT], MENU_WIDGETS_ICON_ACHIEVEMENT],
0, 0,
state->y, state->y,
0, 1, pure_white); 0, pure_white);
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
dispctx->blend_end(video_info->userdata); dispctx->blend_end(video_info->userdata);
} }
@ -194,9 +194,7 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
state->queue[state->queue_read_index].badge, state->queue[state->queue_read_index].badge,
0, 0,
state->y, state->y,
0, 0, pure_white);
1,
pure_white);
} }
/* I _think_ state->unfold changes in another thread */ /* I _think_ state->unfold changes in another thread */

4
gfx/widgets/gfx_widget_leaderboard_display.c
View File

@ -179,7 +179,7 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
widget_size, widget_size, widget_size, widget_size,
p_dispwidget->gfx_widgets_icons_textures[ p_dispwidget->gfx_widgets_icons_textures[
MENU_WIDGETS_ICON_ACHIEVEMENT], MENU_WIDGETS_ICON_ACHIEVEMENT],
x, y, 0, 1, pure_white); x, y, 0, pure_white);
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
dispctx->blend_end(video_info->userdata); dispctx->blend_end(video_info->userdata);
@ -192,7 +192,7 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
p_disp, video_width, video_height, p_disp, video_width, video_height,
widget_size, widget_size, widget_size, widget_size,
state->challenge_info[i].image, state->challenge_info[i].image,
x, y, 0, 1, pure_white); x, y, 0, pure_white);
} }
} }
} }

1
gfx/widgets/gfx_widget_load_content_animation.c
View File

@ -806,7 +806,6 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
icon_x, icon_x,
state->icon_y, state->icon_y,
0.0f, 0.0f,
1.0f,
state->icon_color); state->icon_color);
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)

2
gfx/widgets/gfx_widget_screenshot.c
View File

@ -241,7 +241,7 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
state->thumbnail_height, state->thumbnail_height,
state->texture, state->texture,
0, state->y, 0, state->y,
0, 1, pure_white 0, pure_white
); );
gfx_widgets_draw_text(font_regular, gfx_widgets_draw_text(font_regular,

2
gfx/widgets/gfx_widget_volume.c
View File

@ -199,7 +199,7 @@ static void gfx_widget_volume_frame(void* data, void *user_data)
icon_size, icon_size, icon_size, icon_size,
volume_icon, volume_icon,
0, 0, 0, 0,
0, 1, pure_white 0, pure_white
); );
if (dispctx && dispctx->blend_end) if (dispctx && dispctx->blend_end)
dispctx->blend_end(userdata); dispctx->blend_end(userdata);

4
menu/drivers/xmb.c
View File

@ -3679,7 +3679,7 @@ static int xmb_draw_item(
rotate_draw.scale_x = scale_factor; rotate_draw.scale_x = scale_factor;
rotate_draw.scale_y = scale_factor; rotate_draw.scale_y = scale_factor;
rotate_draw.scale_z = 1.0f; rotate_draw.scale_z = 1.0f;
rotate_draw.scale_enable = true; rotate_draw.scale_enable = (scale_factor == 1.0f) ? false : true;
gfx_display_rotate_z(p_disp, &rotate_draw, userdata); gfx_display_rotate_z(p_disp, &rotate_draw, userdata);
@ -5608,7 +5608,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
rotate_draw.scale_x = scale_factor; rotate_draw.scale_x = scale_factor;
rotate_draw.scale_y = scale_factor; rotate_draw.scale_y = scale_factor;
rotate_draw.scale_z = 1.0f; rotate_draw.scale_z = 1.0f;
rotate_draw.scale_enable = true; rotate_draw.scale_enable = (scale_factor == 1.0f) ? false : true;
gfx_display_rotate_z(p_disp, &rotate_draw, userdata); gfx_display_rotate_z(p_disp, &rotate_draw, userdata);