Skip to content

Commit

Permalink
UI: Fix prev/next logo button boundaries in player settings
Browse files Browse the repository at this point in the history
  • Loading branch information
kai-li-wop committed Jul 1, 2024
1 parent 61218a8 commit 026f162
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions code/ui/ui_playersettings.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

#define XPOSITION 128
#define YPOSITION 172
#define YLOGOPOS (YPOSITION + 103)

typedef struct {
menuframework_s menu;
Expand Down Expand Up @@ -587,7 +588,7 @@ static void UI_PlayerSettings_Draw(void) {
i = Com_Clamp(0, (NUM_COLORS - 1), i);

x = 92;
y = 284 - 9;
y = YLOGOPOS;
UI_SetColor(g_color_table[i]);
UI_DrawHandlePic(x, y, 64, 64, uis.spraylogoShaders[s_playersettings.slogo_num]);
Q_strncpyz(logoName, SkipLogoNumber(uis.spraylogoNames[s_playersettings.slogo_num]), sizeof(logoName));
Expand All @@ -601,7 +602,7 @@ static void UI_PlayerSettings_Draw(void) {
}

x = 52;
y = 302 - 9;
y = YLOGOPOS + 18;
UI_SetColor(g_color_table[i]);
UI_DrawHandlePic(x, y, 32, 32, uis.spraylogoShaders[prevlogo]);
if (uis.cursorx >= x && uis.cursorx <= (x + 32) && uis.cursory >= y && uis.cursory <= (y + 32)) {
Expand Down Expand Up @@ -1032,7 +1033,7 @@ static void UI_PlayerSettings_MenuInit(void) {
s_playersettings.logoleft.generic.type = MTYPE_BITMAP;
s_playersettings.logoleft.generic.flags = QMF_LEFT_JUSTIFY;
s_playersettings.logoleft.generic.x = 52;
s_playersettings.logoleft.generic.y = 302;
s_playersettings.logoleft.generic.y = YLOGOPOS + 18;
s_playersettings.logoleft.generic.id = ID_PREVLOGO;
s_playersettings.logoleft.generic.callback = UI_PlayerSettings_MenuEvent;
s_playersettings.logoleft.width = 32;
Expand All @@ -1041,7 +1042,7 @@ static void UI_PlayerSettings_MenuInit(void) {
s_playersettings.logoright.generic.type = MTYPE_BITMAP;
s_playersettings.logoright.generic.flags = QMF_LEFT_JUSTIFY;
s_playersettings.logoright.generic.x = 164;
s_playersettings.logoright.generic.y = 302;
s_playersettings.logoright.generic.y = YLOGOPOS + 18;
s_playersettings.logoright.generic.id = ID_NEXTLOGO;
s_playersettings.logoright.generic.callback = UI_PlayerSettings_MenuEvent;
s_playersettings.logoright.width = 32;
Expand Down

0 comments on commit 026f162

Please sign in to comment.