mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
Adjusted where selectionbox is defined
This commit is contained in:
parent
2580e6a681
commit
922499dada
3 changed files with 8 additions and 5 deletions
|
@ -3569,3 +3569,8 @@ const f32 font_normal_widths[] = {
|
||||||
/* { | } ~ DEL */
|
/* { | } ~ DEL */
|
||||||
0.3125f, 0.2500f, 0.3125f, 0.5000f, 0.5000f
|
0.3125f, 0.2500f, 0.3125f, 0.5000f, 0.5000f
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
ALIGNED8 u8 texture_selectionbox_icon[] = {
|
||||||
|
#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c"
|
||||||
|
};
|
||||||
|
|
|
@ -29,7 +29,7 @@ f32 djui_gfx_get_scale(void) {
|
||||||
wm_api->get_dimensions(&windowWidth, &windowHeight);
|
wm_api->get_dimensions(&windowWidth, &windowHeight);
|
||||||
if (windowHeight < 720 - 64) {
|
if (windowHeight < 720 - 64) {
|
||||||
return 0.5f;
|
return 0.5f;
|
||||||
} else if (windowHeight < 1440 - 64) {
|
} else if (windowHeight < 1440 + 64) {
|
||||||
return 1.0f;
|
return 1.0f;
|
||||||
} else {
|
} else {
|
||||||
return 2.0f;
|
return 2.0f;
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "djui.h"
|
#include "djui.h"
|
||||||
|
|
||||||
ALIGNED8 static u8 texture_selectionbox_icon[] = {
|
extern ALIGNED8 u8 texture_selectionbox_icon[];
|
||||||
#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c"
|
|
||||||
};
|
|
||||||
|
|
||||||
static void djui_selectionbox_set_default_style(struct DjuiBase* base) {
|
static void djui_selectionbox_set_default_style(struct DjuiBase* base) {
|
||||||
struct DjuiSelectionbox* selectionbox = (struct DjuiSelectionbox*)base;
|
struct DjuiSelectionbox* selectionbox = (struct DjuiSelectionbox*)base;
|
||||||
|
|
Loading…
Reference in a new issue