Update ui

program.odin

@@ -26,6 +26,30 @@ UiElementData_FloatInput :: struct {
 	value_string: cstring,
 }
 
+UiButtonType :: enum {
+	Button,
+	Dropdown,
+}
+
+UiElementData_Button :: struct {
+	type: UiButtonType,
+	options: cstring,
+}
+
+MatrixTypes :: enum {
+	Identity,
+	Translation,
+	Scale,
+	Rotation,
+}
+
+@rodata matrix_add_hotkeys := [MatrixTypes]rl.KeyboardKey {
+	.Identity = rl.KeyboardKey.I,
+	.Translation = rl.KeyboardKey.T,
+	.Scale = rl.KeyboardKey.S,
+	.Rotation = rl.KeyboardKey.R,
+}
+
 FontStyle :: struct {
 	font: rl.Font,
 	size, spacing: f32
@@ -66,6 +90,7 @@ input_float_field_as_cstring :: proc(field: ^InputFloatField) -> cstring {
 
 Program :: struct {
 	ui_context: ui.Context,
+	ui_element_focus: ui.ElementId,
 	matrix_float_pool: []f32,
 	matrix_value_string_pool: []InputFloatField,
 	matrix_count: int,
@@ -109,7 +134,9 @@ program_init :: proc(allocator := context.allocator) {
 		inner_area = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT},
 		zoom = 1.0,
 	}
+
 	ui.init(&program.ui_context, 4000, allocator)
+	program.ui_element_focus = ui.element_id_invalid()
 }
 
 world_to_grid_matrix :: proc(grid: Grid) -> mat3 {
@@ -148,12 +175,12 @@ program_update :: proc() {
 	}
 
 	if rl.IsKeyPressed(.TAB) {
-		ui.focus_next_element(&program.ui_context)
+		program.ui_element_focus = ui.focus_next_element(program.ui_element_focus, ui_elements, {.InputFloat})
 	}
 
 	grid := program.grid
 	grid_inner_position := rect_get_tl(grid.inner_area)
-	draw_grid(grid.area, {50.0, 50.0}, rl.GRAY)
+	draw_grid(grid.area, {32.0, 32.0}, rl.GRAY)
 
 	program_render_ui(&program.ui_context, ui_elements)
 }
@@ -171,17 +198,28 @@ draw_grid :: proc(area: rect2, line_interval: v2, color: rl.Color) {
 program_build_ui :: proc() -> (elements: []ui.Element, matrix_container: ^ui.Element) {
 	ui.start(&program.ui_context, {0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT})
 	top_bar_container_config := ui.ElementConfiguration {margin = V2_ONE * 4.0}
+	top_bar_element_margin := V2_ONE * 4.0
 	top_bar_container := ui.container_begin({ui.Size_Percentage(1.0), ui.Size_Pixels(48.0)}, top_bar_container_config)
 	top_bar_inner_height := ui.get_element_inner_area(top_bar_container^).height
 	top_bar_button_dimensions := ui.Dimensions {ui.Size_Pixels(top_bar_inner_height), ui.Size_Pixels(top_bar_inner_height)}
-	top_bar_button_config := ui.ElementConfiguration {margin = V2_ONE * 4}
+	top_bar_button_config := ui.ElementConfiguration {margin = top_bar_element_margin}
+	top_bar_dropdown_dimensions := ui.Dimensions {ui.Size_Pixels(192.0), ui.Size_Percentage(1.0)}
+	top_bar_dropdown_config := ui.ElementConfiguration {margin = top_bar_element_margin}
 	{
-		config := top_bar_button_config
-		config.label = "+"
-		ui.button(top_bar_button_dimensions, config)
-		config.label = "-"
+		button_config := top_bar_button_config
+		button_config.label = "+"
+		ui.element(.Button, top_bar_button_dimensions, button_config)
+		button_config.label = "-"
 		ui.same_line()
-		ui.button(top_bar_button_dimensions, config)
+		ui.element(.Button, top_bar_button_dimensions, button_config)
+
+		ui.same_line()
+		matrix_dropdown_config := top_bar_dropdown_config
+		matrix_dropdown_config.label = enum_to_raygui_options_string_hotkey(MatrixTypes, &matrix_add_hotkeys, context.temp_allocator)
+		matrix_dropdown_data := new(UiElementData_Button, context.temp_allocator)
+		matrix_dropdown_data^ = {type = .Dropdown}
+
+		ui.element(.Button, top_bar_dropdown_dimensions, matrix_dropdown_config)
 	}
 	ui.container_end()
 
@@ -212,7 +250,7 @@ ui_mat3 :: proc(mat: []f32, value_strings: []InputFloatField, dimensions: ui.Dim
 				data := new(UiElementData_FloatInput, allocator)
 				index := i * 3 + j
 				data^ = {value = &mat[index], value_string = input_float_field_as_cstring(&value_strings[index])}
-				ui.input_float(matrix_input_dimensions, matrix_input_config, data)
+				ui.element(.InputFloat, matrix_input_dimensions, matrix_input_config, data)
 				ui.same_line()
 			}
 			program.ui_context.same_line = false
@@ -242,7 +280,7 @@ program_render_ui :: proc(ctx: ^ui.Context, elements: []ui.Element) {
 		}
 
 		area := rect_translate(rl.Rectangle(element.area), offset)
-		switch element.type {
+		#partial switch element.type {
 		case .Container:
 			dim := rl.Color {0, 0, 0, 192}
 			if element.data != nil {
@@ -279,8 +317,8 @@ program_render_ui :: proc(ctx: ^ui.Context, elements: []ui.Element) {
 			rl.GuiSlider(area, element.label, "", data.value, data.min, data.max)
 		case .InputFloat:
 			data := cast(^UiElementData_FloatInput)element.data
-			if rl.GuiValueBoxFloat(area, element.label, data.value_string, data.value, ui.is_element_focused(ctx, element)) == 1 {
-				ui.focus_element(ctx, element)
+			if rl.GuiValueBoxFloat(area, element.label, data.value_string, data.value, program.ui_element_focus == element.id) == 1 {
+				program.ui_element_focus = element.id
 			}
 		}
 	}