Format
This commit is contained in:
+29
-31
@@ -1,31 +1,29 @@
|
||||
|
||||
let ui_menu_show: bool = false;
|
||||
let ui_menu_nested: bool = false;
|
||||
let ui_menu_x: i32 = 0;
|
||||
let ui_menu_y: i32 = 0;
|
||||
let ui_menu_h: i32 = 0;
|
||||
let ui_menu_keep_open: bool = false;
|
||||
let ui_menu_commands: ()=>void = null;
|
||||
let ui_menu_show_first: bool = true;
|
||||
let ui_menu_hide_flag: bool = false;
|
||||
let ui_menu_show: bool = false;
|
||||
let ui_menu_nested: bool = false;
|
||||
let ui_menu_x: i32 = 0;
|
||||
let ui_menu_y: i32 = 0;
|
||||
let ui_menu_h: i32 = 0;
|
||||
let ui_menu_keep_open: bool = false;
|
||||
let ui_menu_commands: () => void = null;
|
||||
let ui_menu_show_first: bool = true;
|
||||
let ui_menu_hide_flag: bool = false;
|
||||
|
||||
let _ui_menu_render_msg: string;
|
||||
|
||||
function ui_menu_render() {
|
||||
let menu_w: i32 = ui_menu_commands != null ?
|
||||
math_floor(base_default_element_w * UI_SCALE() * 2.3) :
|
||||
math_floor(UI_ELEMENT_W() * 2.3);
|
||||
let menu_w: i32 = ui_menu_commands != null ? math_floor(base_default_element_w * UI_SCALE() * 2.3) : math_floor(UI_ELEMENT_W() * 2.3);
|
||||
|
||||
let _FILL_BUTTON_BG: i32 = ui.ops.theme.FILL_BUTTON_BG;
|
||||
let _FILL_BUTTON_BG: i32 = ui.ops.theme.FILL_BUTTON_BG;
|
||||
ui.ops.theme.FILL_BUTTON_BG = false;
|
||||
let _ELEMENT_OFFSET: i32 = ui.ops.theme.ELEMENT_OFFSET;
|
||||
let _ELEMENT_OFFSET: i32 = ui.ops.theme.ELEMENT_OFFSET;
|
||||
ui.ops.theme.ELEMENT_OFFSET = 0;
|
||||
let _ELEMENT_H: i32 = ui.ops.theme.ELEMENT_H;
|
||||
ui.ops.theme.ELEMENT_H = config_raw.touch_ui ? (28 + 2) : 28;
|
||||
let _ELEMENT_H: i32 = ui.ops.theme.ELEMENT_H;
|
||||
ui.ops.theme.ELEMENT_H = config_raw.touch_ui ? (28 + 2) : 28;
|
||||
|
||||
if (ui_menu_nested) {
|
||||
ui_menu_show_first = true;
|
||||
ui_menu_nested = false;
|
||||
ui_menu_nested = false;
|
||||
}
|
||||
|
||||
// First draw out of screen, then align the menu based on menu height
|
||||
@@ -43,12 +41,13 @@ function ui_menu_render() {
|
||||
ui_menu_commands();
|
||||
}
|
||||
|
||||
ui_menu_hide_flag = ui.combo_selected_handle == null && !ui_menu_keep_open && !ui_menu_show_first && (ui.changed || ui.input_released || ui.input_released_r || ui.is_escape_down);
|
||||
ui_menu_hide_flag = ui.combo_selected_handle == null && !ui_menu_keep_open && !ui_menu_show_first &&
|
||||
(ui.changed || ui.input_released || ui.input_released_r || ui.is_escape_down);
|
||||
ui_menu_keep_open = false;
|
||||
|
||||
ui.ops.theme.FILL_BUTTON_BG = _FILL_BUTTON_BG;
|
||||
ui.ops.theme.ELEMENT_OFFSET = _ELEMENT_OFFSET;
|
||||
ui.ops.theme.ELEMENT_H = _ELEMENT_H;
|
||||
ui.ops.theme.ELEMENT_H = _ELEMENT_H;
|
||||
ui_menu_end();
|
||||
ui_end_region();
|
||||
ui.input_enabled = true;
|
||||
@@ -56,8 +55,8 @@ function ui_menu_render() {
|
||||
|
||||
if (ui_menu_show_first) {
|
||||
ui_menu_show_first = false;
|
||||
ui_menu_keep_open = true;
|
||||
ui_menu_h = ui._y - ui_menu_y;
|
||||
ui_menu_keep_open = true;
|
||||
ui_menu_h = ui._y - ui_menu_y;
|
||||
ui_menu_x += iron_window_width() * 2;
|
||||
ui_menu_y += iron_window_height() * 2;
|
||||
ui_menu_fit_to_screen();
|
||||
@@ -67,7 +66,7 @@ function ui_menu_render() {
|
||||
if (ui_menu_hide_flag) {
|
||||
ui_menu_hide();
|
||||
ui_menu_show_first = true;
|
||||
ui_menu_commands = null;
|
||||
ui_menu_commands = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,17 +75,17 @@ function ui_menu_hide() {
|
||||
base_redraw_ui();
|
||||
}
|
||||
|
||||
function ui_menu_draw(commands: ()=>void = null, x: i32 = -1, y: i32 = -1) {
|
||||
function ui_menu_draw(commands: () => void = null, x: i32 = -1, y: i32 = -1) {
|
||||
ui_end_input();
|
||||
if (ui_menu_show) {
|
||||
ui_menu_nested = true;
|
||||
ui_menu_nested = true;
|
||||
ui_menu_keep_open = true;
|
||||
}
|
||||
ui_menu_show = true;
|
||||
ui_menu_show = true;
|
||||
ui_menu_commands = commands;
|
||||
ui_menu_x = x > -1 ? x : math_floor(mouse_x + 1);
|
||||
ui_menu_y = y > -1 ? y : math_floor(mouse_y + 1);
|
||||
ui_menu_h = 0;
|
||||
ui_menu_x = x > -1 ? x : math_floor(mouse_x + 1);
|
||||
ui_menu_y = y > -1 ? y : math_floor(mouse_y + 1);
|
||||
ui_menu_h = 0;
|
||||
}
|
||||
|
||||
function ui_menu_fit_to_screen() {
|
||||
@@ -130,7 +129,7 @@ function ui_menu_button(text: string, label: string = ""): bool {
|
||||
|
||||
function ui_menu_align() {
|
||||
if (!config_raw.touch_ui) {
|
||||
let row: f32[] = [12 / 100, 88 / 100];
|
||||
let row: f32[] = [ 12 / 100, 88 / 100 ];
|
||||
ui_row(row);
|
||||
ui_end_element();
|
||||
}
|
||||
@@ -144,5 +143,4 @@ function ui_menu_start() {
|
||||
draw_set_color(0xffffffff);
|
||||
}
|
||||
|
||||
function ui_menu_end() {
|
||||
}
|
||||
function ui_menu_end() {}
|
||||
|
||||
Reference in New Issue
Block a user