refactor: Rename get_text_width and get_text_width_no_cache functions to text_width and text_width_no_cache, remove unused caching logic for simpler handling

Author: mike-ward

examples/icon_font_demo.v

@@ -106,7 +106,7 @@ fn icon_catalog(mut w gui.Window) gui.View {
 	// find the longest text
 	if app.longest == 0 {
 		for s in gui.icons_map.keys() {
-			app.longest = f32_max(gui.get_text_width(s, gui.theme().n4, mut w), app.longest)
+			app.longest = f32_max(gui.text_width(s, gui.theme().n4, mut w), app.longest)
 		}
 	}
 

examples/showcase.v

@@ -1348,7 +1348,7 @@ fn icon_catalog(mut w gui.Window) gui.View {
 	// find the longest text
 	mut longest := f32(0)
 	for s in gui.icons_map.keys() {
-		longest = f32_max(gui.get_text_width(s, gui.theme().n4, mut w), longest)
+		longest = f32_max(gui.text_width(s, gui.theme().n4, mut w), longest)
 	}
 
 	// Break the icons_maps into rows

stats.v

@@ -125,7 +125,6 @@ fn (vs ViewState) view_state_stats() string {
 	tx << 'input_state length       ${cm(usize(vs.input_state.len)):8}'
 	tx << 'scroll_x length          ${cm(usize(vs.scroll_x.len)):8}'
 	tx << 'scroll_y length          ${cm(usize(vs.scroll_y.len)):8}'
-	tx << 'text_widths length       ${cm(usize(vs.text_widths.len)):8}'
 	tx << 'menu_state length        ${cm(usize(vs.menu_state.len)):8}'
 	tx << 'image_map length         ${cm(usize(vs.image_map.len)):8}'
 	tx << 'select_state length      ${cm(usize(vs.select_state.len)):8}'

view_date_picker.v

@@ -395,17 +395,17 @@ fn dates(times []time.Time) []time.Time {
 
 fn (cfg DatePickerCfg) cell_size(w &Window) f32 {
 	w_size := match cfg.weekdays_len {
-		.one_letter { get_text_width_no_cache('W', cfg.text_style, w) }
-		.three_letter { get_text_width_no_cache('Wed', cfg.text_style, w) }
-		.full { get_text_width_no_cache('Wednesday', cfg.text_style, w) }
+		.one_letter { text_width_no_cache('W', cfg.text_style, w) }
+		.three_letter { text_width_no_cache('Wed', cfg.text_style, w) }
+		.full { text_width_no_cache('Wednesday', cfg.text_style, w) }
 	}
-	d_size := get_text_width_no_cache('00', cfg.text_style, w)
+	d_size := text_width_no_cache('00', cfg.text_style, w)
 	return f32_max(w_size, d_size) + gui_theme.button_style.padding.width() + padding_two.width()
 }
 
 fn (cfg DatePickerCfg) month_picker_width(w &Window) f32 {
-	return get_text_width_no_cache('May', cfg.text_style, w) +
-		gui_theme.button_style.padding.width() + gui_theme.button_style.padding_border.width()
+	return text_width_no_cache('May', cfg.text_style, w) + gui_theme.button_style.padding.width() +
+		gui_theme.button_style.padding_border.width()
 }
 
 fn (cfg DatePickerCfg) disabled(date time.Time, state DatePickerState) bool {

view_pulsar.v

@@ -22,7 +22,7 @@ pub fn (window &Window) pulsar(cfg PulsarCfg) View {
 
 	width := match cfg.width > 0 {
 		true { cfg.width }
-		else { get_text_width_no_cache(cfg.icon1, text_style, window) }
+		else { text_width_no_cache(cfg.icon1, text_style, window) }
 	}
 	txt := if window.view_state.input_cursor_on { cfg.icon1 } else { cfg.icon2 }
 

view_state.v

@@ -10,7 +10,6 @@ mut:
 	input_date_state  map[string]bool            // [id] -> visible
 	scroll_x          map[u32]f32                // [id_scroll] -> scroll offset x
 	scroll_y          map[u32]f32                // [id_scroll] -> scroll offset y
-	text_widths       map[u32]f32                // [text + hash(text_style)] -> text width
 	mouse_cursor      sapp.MouseCursor           // arrow, finger, ibeam, etc.
 	menu_state        map[u32]string             // [id_menubar] -> id of menu
 	menu_key_nav      bool                       // true, menu navigated by keyboard

view_table.v

@@ -207,7 +207,7 @@ fn (mut window Window) table_column_widths(cfg &TableCfg) []f32 {
 				if cell.head_cell { cfg.text_style_head } else { cfg.text_style }
 			}
 
-			width := get_text_width(row.cells[idx].value, text_style, mut window)
+			width := text_width(row.cells[idx].value, text_style, mut window)
 			longest = f32_max(width, longest)
 		}
 		column_widths << longest

view_text.v

@@ -64,7 +64,7 @@ fn (mut tv TextView) generate_layout(mut window Window) Layout {
 			on_click:            tv.on_click
 		}
 	}
-	layout.shape.width = text_width(layout.shape, mut window)
+	layout.shape.width = text_width_shape(layout.shape, mut window)
 	layout.shape.height = text_height(layout.shape, mut window)
 	if tv.mode == .single_line || layout.shape.sizing.width == .fixed {
 		layout.shape.min_width = f32_max(layout.shape.width, layout.shape.min_width)

view_tree.v

@@ -71,7 +71,7 @@ fn (cfg &TreeCfg) node_content(node TreeNodeCfg, mut window Window) []View {
 		is_open { icon_drop_down }
 		else { icon_drop_right }
 	}
-	min_width_icon := get_text_width('${icon_bar} ', node.text_style_icon, mut window)
+	min_width_icon := text_width('${icon_bar} ', node.text_style_icon, mut window)
 
 	mut content := []View{cap: 2}
 	cfg_id := cfg.id

xtra_rtf.v

@@ -37,7 +37,7 @@ fn rtf_simple_wrap(spans datatypes.LinkedList[TextSpan], mut window Window) data
 				x = 0
 				y += span.style.size + span.style.line_spacing
 			}
-			width := get_text_width(line, span.style, mut window)
+			width := text_width(line, span.style, mut window)
 			tspans.push(TextSpan{
 				x:     x
 				y:     y
@@ -91,7 +91,7 @@ fn rtf_wrap_text(spans datatypes.LinkedList[TextSpan], width f32, tab_size u32,
 				continue
 			}
 			if tspan.text.len == 0 {
-				field_width := get_text_width(field, tspan.style, mut window)
+				field_width := text_width(field, tspan.style, mut window)
 				if x + field_width > width {
 					x = 0
 					y += h
@@ -105,9 +105,9 @@ fn rtf_wrap_text(spans datatypes.LinkedList[TextSpan], width f32, tab_size u32,
 				continue
 			}
 			line := tspan.text + field
-			line_width := get_text_width(line, tspan.style, mut window)
+			line_width := text_width(line, tspan.style, mut window)
 			if x + line_width > width {
-				tspan.w = get_text_width(tspan.text, tspan.style, mut window)
+				tspan.w = text_width(tspan.text, tspan.style, mut window)
 				tspans.push(tspan)
 				x = 0
 				y += h