Ver Fonte

Android fixes

luboslenco há 1 mês atrás
pai
commit
a78bb73665
2 ficheiros alterados com 6 adições e 0 exclusões
  1. 2 0
      base/sources/ts/ui_menu.ts
  2. 4 0
      paint/sources/ui_header_ext.ts

+ 2 - 0
base/sources/ts/ui_menu.ts

@@ -36,6 +36,7 @@ function ui_menu_render() {
 
 	draw_begin();
 	ui_begin_region(ui, ui_menu_x, ui_menu_y, menu_w);
+	ui.input_enabled = ui.combo_selected_handle == null;
 	ui_menu_start();
 
 	if (ui_menu_commands != null) {
@@ -50,6 +51,7 @@ function ui_menu_render() {
 	ui.ops.theme.ELEMENT_H = _ELEMENT_H;
 	ui_menu_end();
 	ui_end_region();
+	ui.input_enabled = true;
 	draw_end();
 
 	if (ui_menu_show_first) {

+ 4 - 0
paint/sources/ui_header_ext.ts

@@ -186,6 +186,10 @@ function ui_header_draw_tool_properties() {
 
 		context_raw.bake_type = ui_combo(bake_handle, bakes, tr("Bake"));
 
+		if (bake_handle.changed && ui_menu_show) {
+			ui_menu_nested = true; // Update menu height
+		}
+
 		if (rt_bake) {
 			let samples_handle: ui_handle_t = ui_handle(__ID__);
 			if (samples_handle.init) {