code/sectr/app/screen.odin

@@ -25,7 +25,6 @@ UI_ScreenState :: struct
 		min_zoom_inputbox       : UI_TextInputBox,
 		max_zoom_inputbox       : UI_TextInputBox,
 		cfg_drop_down           : UI_DropDown,
-		zoom_mode_drop_down     : UI_DropDown,
 		pos, size, min_size     : Vec2,
 		is_open                 : b32,
 		is_maximized            : b32,
@@ -378,60 +377,6 @@ ui_screen_settings_menu :: proc( captures : rawptr = nil ) -> ( should_raise : b
 					}
 				}
 			}
-
-			Zoom_Mode:
-			{
-				scope( theme_table_row(is_even = true))
-				hb := ui_hbox(.Left_To_Right, "settings_menu.cam_zoom_mode.hb"); {
-					using hb
-
-					layout.size.min = {0, 35}
-					layout.flags    = {.Fixed_Height}
-					layout.padding  = to_ui_layout_side(4)
-				}
-
-				scope(theme_text)
-				title := ui_text("settings_menu.cam_zoom_mode.title", str_intern("Camera: Zoom Mode")); {
-					using title
-					layout.anchor.ratio.x = 1.0
-					layout.margins.left   = 10
-					layout.font_size      = 12
-				}
-
-				// TODO(Ed): This is technically a manual drop-down as the vbox within ui_dropdown is unusuable for attaching the buttons
-				// This can be alleviated if we add an option for the drop-down to support a floating vbox (fixed position computed, following drop_down btn)
-				// For now its buttons are attached to app_config vbox
-				mode_selector := ui_drop_down( & zoom_mode_drop_down, "settings_menu.cam_zoom_mode.drop_down", str_intern_fmt("%s", config.cam_zoom_mode), vb_compute_layout = true )
-				mode_selector.btn.layout.size.min = { 80, mode_selector.btn.layout.size.min.y }
-				if mode_selector.is_open
-				{
-					idx := 1
-					for entry in CameraZoomMode
-					{
-						ui_parent(app_config.vbox)
-						scope(theme_button)
-						btn := ui_button(str_intern_fmt("settings_menu.cam_zoom_mode.%s.btn", entry).str)
-						{
-								using btn
-								layout.size.min    = {100, 25}
-								layout.alignment   = {1.0, 0}
-								layout.anchor.left = 1.0
-								layout.flags       = {.Fixed_Height}
-								layout.padding     = to_ui_layout_side(4)
-
-								ui_parent(btn)
-								scope(theme_text)
-								text_widget := ui_text(str_intern_fmt("settings_menu.cam_zoom_mode.%s.text", entry).str, str_intern_fmt("%s", entry))
-						}
-
-						if btn.pressed {
-							mode_selector.should_close = true
-							config.cam_zoom_mode       = entry
-							screen_ui.active           = 0
-						}
-					}
-				}
-			}
 		}
 	}
 	ui_vbox_end(vbox, compute_layout = false )

code/sectr/engine/update.odin

@@ -243,6 +243,7 @@ update :: proc( delta_time : f64 ) -> b32
 			return clamp(binary_search_closest(levels, zoom), 0, len(levels) - 1)
 		}
 
+		config.cam_zoom_mode = .Digital
 		switch config.cam_zoom_mode
 		{
 			case .Smooth:

code/sectr/ui/layout_widget.odin

@@ -69,8 +69,8 @@ ui_layout_children_horizontally :: proc( container : ^UI_Box, direction : UI_Lay
 			for child := container.first; child != nil; child = child.next {
 				using child.layout
 				child_width := allocate_space(child, total_stretch_ratio, avail_flex_space, container_height)
-				anchor       = range2({0, anchor.bottom}, {0, anchor.top})
-				alignment    = {0, alignment.y}
+				anchor       = range2({0, 0}, {0, 0})
+				alignment    = {0, 0}
 				pos.x        = space_used
 				space_used  += child_width + child.layout.margins.left + child.layout.margins.right
 			}
@@ -78,8 +78,8 @@ ui_layout_children_horizontally :: proc( container : ^UI_Box, direction : UI_Lay
 			for child := container.first; child != nil; child = child.next {
 				using child.layout
 				child_width := allocate_space(child, total_stretch_ratio, avail_flex_space, container_height)
-				anchor       = range2({1, anchor.bottom}, {0, anchor.top})
-				alignment    = {1, alignment.y}
+				anchor       = range2({1, 0}, {0, 0})
+				alignment    = {1, 0}
 				pos.x        = space_used
 				space_used  -= child_width + child.layout.margins.left + child.layout.margins.right
 			}
@@ -148,8 +148,8 @@ ui_layout_children_vertically :: proc( container : ^UI_Box, direction : UI_Layou
 			for child := container.first; child != nil; child = child.next {
 				using child.layout
 				child_height := allocate_space(child, total_stretch_ratio, avail_flex_space, container_width)
-				anchor      = range2({anchor.left, 1}, {anchor.right, 0})
-				alignment   = {alignment.x, 1}
+				anchor      = range2({0, 1}, {0, 0})
+				alignment   = {0, 1}
 				pos.y       = space_used
 				space_used -= child_height - child.layout.margins.top - child.layout.margins.bottom
 			}
@@ -157,8 +157,8 @@ ui_layout_children_vertically :: proc( container : ^UI_Box, direction : UI_Layou
 			for child := container.first; child != nil; child = child.next {
 				using child.layout
 				child_height := allocate_space(child, total_stretch_ratio, avail_flex_space, container_width)
-				anchor        = range2({anchor.left,0}, {anchor.right, 0})
-				alignment     = {alignment.x, 0}
+				anchor        = range2({0,0}, {0, 0})
+				alignment     = {0, 0}
 				pos.y         = space_used
 				space_used   += child_height - child.layout.margins.top - child.layout.margins.bottom
 			}

code/sectr/ui/widgets.odin

@@ -28,11 +28,10 @@ ui_button :: proc( label : string, flags : UI_BoxFlags = {} ) -> (btn : UI_Widge
 
 #region("Drop Down")
 UI_DropDown :: struct {
-	btn          : UI_Widget,
-	title        : UI_Widget,
-	vbox         : UI_VBox,
-	is_open      : b32,
-	should_close : b32,
+	btn     : UI_Widget,
+	title   : UI_Widget,
+	vbox    : UI_VBox,
+	is_open : bool,
 }
 
 @(deferred_out = ui_drop_down_end_auto)
@@ -42,12 +41,11 @@ ui_drop_down :: proc( drop_down : ^UI_DropDown, label : string, title_text : Str
 	vb_flags          := UI_BoxFlags{},
 	vb_compute_layout := true,
 	btn_theme   : ^UI_Theme = nil,
-	title_theme : ^UI_Theme = nil,
-	vb_parent   : ^UI_Box   = nil,
+	title_theme : ^UI_Theme = nil
 ) -> (deferred : ^UI_DropDown)
 {
 	deferred = drop_down
-	ui_drop_down_begin(drop_down, label, title_text, direction, btn_flags, vb_flags, btn_theme, title_theme, vb_parent, vb_compute_layout)
+	ui_drop_down_begin(drop_down, label, title_text, direction, btn_flags, vb_flags, btn_theme, title_theme)
 	if ! drop_down.is_open do return
 	ui_parent_push(drop_down.vbox)
 	return
@@ -60,7 +58,6 @@ ui_drop_down_begin :: proc( drop_down : ^UI_DropDown, label : string, title_text
 	vb_flags  := UI_BoxFlags{},
 	btn_theme   : ^UI_Theme = nil,
 	title_theme : ^UI_Theme = nil,
-	vb_parent   : ^UI_Box   = nil,
 	vb_compute_layout := true )
 {
 	using drop_down
@@ -80,23 +77,13 @@ ui_drop_down_begin :: proc( drop_down : ^UI_DropDown, label : string, title_text
 	}
 
 	if btn.pressed {
-		is_open = ! is_open
+		is_open = !is_open
 	}
-	is_open &= ! should_close
-	should_close = false
-
 	if is_open == false do return
 
 	scope(theme_transparent)
-	if vb_parent != nil {
-		ui_parent_push(vb_parent)
-	}
 	vbox = ui_vbox_begin( direction, str_intern_fmt("%v : vbox", label).str, compute_layout = vb_compute_layout )
 	vbox.layout.anchor.ratio.y = 1.0
-
-	if vb_parent != nil {
-		ui_parent_pop()
-	}
 }
 
 ui_drop_down_end :: proc( drop_down : ^UI_DropDown ) {