gg.Event instead of sapp.event, starting tap event (vlang#304)

Author: rcqls

button.v

@@ -10,10 +10,6 @@ import os
 const (
 	button_bg_color           = gx.rgb(28, 28, 28)
 	button_border_color       = gx.rgb(200, 200, 200)
-	btn_text_cfg              = gx.TextCfg{ // color: gx.white, {
-		color: gx.rgb(38, 38, 38)
-		align: gx.align_left
-	}
 	button_horizontal_padding = 26
 	button_vertical_padding   = 8
 )
@@ -31,6 +27,9 @@ pub struct ButtonConfig {
 	onclick   ButtonClickFn
 	height    int = 20
 	width     int
+	z_index   int
+	text_cfg  gx.TextCfg
+	text_size f64
 }
 
 [heap]
@@ -42,6 +41,7 @@ pub mut:
 	state      ButtonState
 	height     int
 	width      int
+	z_index    int
 	x          int
 	y          int
 	parent     Layout
@@ -52,6 +52,9 @@ pub mut:
 	icon_path  string
 	image      gg.Image
 	use_icon   bool
+	text_cfg   gx.TextCfg
+	text_size  f64
+	fixed_text bool
 }
 
 fn (mut b Button) init(parent Layout) {
@@ -61,6 +64,16 @@ fn (mut b Button) init(parent Layout) {
 	if b.use_icon {
 		b.image = b.ui.gg.create_image(b.icon_path)
 	}
+	if is_empty_text_cfg(b.text_cfg) {
+		b.text_cfg = b.ui.window.text_cfg
+	}
+	if b.text_size > 0 {
+		_, win_height := b.ui.window.size()
+		b.text_cfg = gx.TextCfg{
+			...b.text_cfg
+			size: text_size_as_int(b.text_size, win_height)
+		}
+	}
 	mut subscriber := parent.get_subscriber()
 	subscriber.subscribe_method(events.on_mouse_down, btn_click, b)
 	subscriber.subscribe_method(events.on_click, btn_click, b)
@@ -70,10 +83,13 @@ pub fn button(c ButtonConfig) &Button {
 	mut b := &Button{
 		width: c.width
 		height: c.height
+		z_index: c.z_index
 		text: c.text
 		icon_path: c.icon_path
 		use_icon: c.icon_path != ''
 		onclick: c.onclick
+		text_cfg: c.text_cfg
+		text_size: c.text_size
 		ui: 0
 	}
 	if b.use_icon && !os.exists(c.icon_path) {
@@ -103,7 +119,7 @@ fn (mut b Button) set_pos(x int, y int) {
 }
 
 fn (mut b Button) size() (int, int) {
-	if b.width == 0 && b.height == 0 {
+	if b.width == 0 || b.height == 0 {
 		b.set_text_size()
 	}
 	return b.width, b.height
@@ -118,7 +134,7 @@ fn (mut b Button) propose_size(w int, h int) (int, int) {
 		b.height = h
 	}
 	// b.height = h
-	// b.width = b.ui.ft.text_width(b.text) + button_horizontal_padding
+	// b.width = b.ui.ft.text_width(b.text) + ui.button_horizontal_padding
 	// b.height = 20 // vertical padding
 	return b.width, b.height
 }
@@ -145,15 +161,20 @@ fn (mut b Button) draw() {
 	b.ui.gg.draw_empty_rect(b.x, b.y, b.width, b.height, ui.button_border_color)
 	mut y := bcenter_y - h2 - 1
 	// if b.ui.gg.scale == 2 {
-	$if macos { // TODO
-		y -= 2
-	}
+	// $if macos { // TODO
+	// 	y -= 2
+	// }
 	if b.use_icon {
 		b.ui.gg.draw_image(b.x, b.y, b.width, b.height, b.image)
 	} else {
-		b.ui.gg.draw_text(bcenter_x - w2, y, b.text, ui.btn_text_cfg)
+		// b.ui.gg.draw_text(bcenter_x - w2, y, b.text, b.text_cfg.as_text_cfg())
+		b.draw_text(bcenter_x - w2, y, b.text)
+	}
+	$if bb ? {
+		draw_bb(b, b.ui)
+		draw_text_bb(bcenter_x - w2, y, b.text_width, b.text_height, b.ui)
 	}
-	// b.ui.gg.draw_empty_rect(bcenter_x-w2, bcenter_y-h2, text_width, text_height, button_border_color)
+	// b.ui.gg.draw_empty_rect(bcenter_x-w2, bcenter_y-h2, text_width, text_height, ui.button_border_color)
 }
 
 fn (mut b Button) set_text_size() {
@@ -164,8 +185,8 @@ fn (mut b Button) set_text_size() {
 	// if b.text_width == 0 || b.text_height == 0 {
 	else if b.ui != 0 {
 		b.text_width, b.text_height = b.ui.gg.text_size(b.text)
-		b.text_width = int(f32(b.text_width) * b.ui.gg.scale) // * b.ui.gg.scale)
-		b.text_height = int(f32(b.text_height) * b.ui.gg.scale) // * b.ui.gg.scale)
+		b.text_width = int(f32(b.text_width) * b.ui.gg.scale * b.ui.gg.scale)
+		b.text_height = int(f32(b.text_height) * b.ui.gg.scale * b.ui.gg.scale)
 		if b.width == 0 {
 			b.width = b.text_width + ui.button_horizontal_padding
 		}

canvas.v

@@ -9,10 +9,11 @@ pub type DrawFn = fn (ctx &gg.Context, state voidptr, c &Canvas) // x_offset int
 
 pub struct Canvas {
 pub mut:
-	width  int
-	height int
-	x      int
-	y      int
+	width   int
+	height  int
+	x       int
+	y       int
+	z_index int
 mut:
 	parent  Layout
 	draw_fn DrawFn      = voidptr(0)
@@ -22,6 +23,7 @@ mut:
 pub struct CanvasConfig {
 	width   int
 	height  int
+	z_index int
 	text    string
 	draw_fn DrawFn = voidptr(0)
 }
@@ -35,6 +37,7 @@ pub fn canvas(c CanvasConfig) &Canvas {
 	mut canvas := &Canvas{
 		width: c.width
 		height: c.height
+		z_index: c.z_index
 		draw_fn: c.draw_fn
 	}
 	return canvas

checkbox.v

@@ -27,18 +27,21 @@ pub mut:
 	width            int
 	x                int
 	y                int
+	z_index          int
 	parent           Layout
 	is_focused       bool
 	checked          bool
 	ui               &UI
 	on_check_changed CheckChangedFn
 	text             string
 	disabled         bool
+	text_cfg         gx.TextCfg
 }
 
 pub struct CheckBoxConfig {
 	x                int
 	y                int
+	z_index          int
 	parent           Layout
 	text             string
 	on_check_changed CheckChangedFn
@@ -48,16 +51,17 @@ pub struct CheckBoxConfig {
 
 fn (mut cb CheckBox) init(parent Layout) {
 	cb.parent = parent
-	pui := parent.get_ui()
-	cb.ui = pui
+	cb.ui = parent.get_ui()
 	cb.width = cb.ui.gg.text_width(cb.text) + 5 + ui.check_mark_size
+	cb.text_cfg = cb.ui.window.text_cfg
 	mut subscriber := parent.get_subscriber()
 	subscriber.subscribe_method(events.on_click, cb_click, cb)
 }
 
 pub fn checkbox(c CheckBoxConfig) &CheckBox {
 	mut cb := &CheckBox{
 		height: 20 // TODO
+		z_index: c.z_index
 		ui: 0
 		text: c.text
 		on_check_changed: c.on_check_changed
@@ -70,6 +74,7 @@ pub fn checkbox(c CheckBoxConfig) &CheckBox {
 fn cb_click(mut cb CheckBox, e &MouseEvent, window &Window) {
 	if cb.point_inside(e.x, e.y) { // && e.action == 0 {
 		cb.checked = !cb.checked
+		// println("checked: $cb.checked")
 		if cb.on_check_changed != voidptr(0) {
 			cb.on_check_changed(window.state, cb.checked)
 		}
@@ -113,7 +118,10 @@ fn (mut cb CheckBox) draw() {
 		cb.ui.gg.draw_image(cb.x + 3, cb.y + 3, 8, 8, cb.ui.cb_image)
 	}
 	// Text
-	cb.ui.gg.draw_text(cb.x + ui.check_mark_size + 5, cb.y, cb.text, btn_text_cfg)
+	cb.ui.gg.draw_text(cb.x + ui.check_mark_size + 5, cb.y, cb.text, cb.text_cfg)
+	$if bb ? {
+		draw_bb(cb, cb.ui)
+	}
 }
 
 fn (cb &CheckBox) point_inside(x f64, y f64) bool {

dropdown.v

@@ -22,6 +22,7 @@ mut:
 	parent               Layout
 	x                    int
 	y                    int
+	z_index              int
 	ui                   &UI
 	items                []DropdownItem
 	open                 bool
@@ -36,6 +37,7 @@ pub struct DropdownConfig {
 	x                    int
 	y                    int
 	width                int
+	z_index              int = 10
 	parent               Layout
 	selected_index       int = -1
 	on_selection_changed SelectionChangedFn
@@ -59,6 +61,7 @@ fn (mut dd Dropdown) init(parent Layout) {
 pub fn dropdown(c DropdownConfig, items []DropdownItem) &Dropdown {
 	mut dd := &Dropdown{
 		width: c.width
+		z_index: c.z_index
 		items: items
 		selected_index: c.selected_index
 		on_selection_changed: c.on_selection_changed
@@ -83,7 +86,7 @@ fn (mut dd Dropdown) propose_size(w int, h int) (int, int) {
 	return w, ui.dropdown_height
 }
 
-fn (mut dd Dropdown) draw() {
+fn (dd &Dropdown) draw() {
 	gg := dd.ui.gg
 	// draw the main dropdown
 	gg.draw_rect(dd.x, dd.y, dd.width, ui.dropdown_height, ui.dropdown_color)
@@ -93,8 +96,15 @@ fn (mut dd Dropdown) draw() {
 	} else {
 		gg.draw_text_def(dd.x + 5, dd.y + 5, dd.def_text)
 	}
+	dd.draw_open()
+	// draw the arrow
+	gg.draw_image(dd.x + (dd.width - 28), dd.y - 3, 28, 28, dd.ui.down_arrow)
+}
+
+fn (dd &Dropdown) draw_open() {
 	// draw the drawer
 	if dd.open {
+		gg := dd.ui.gg
 		gg.draw_rect(dd.x, dd.y + ui.dropdown_height, dd.width, dd.items.len * ui.dropdown_height,
 			ui.drawer_color)
 		gg.draw_empty_rect(dd.x, dd.y + ui.dropdown_height, dd.width, dd.items.len * ui.dropdown_height,
@@ -109,8 +119,6 @@ fn (mut dd Dropdown) draw() {
 			gg.draw_text_def(dd.x + 5, y + i * ui.dropdown_height + 5, item.text)
 		}
 	}
-	// draw the arrow
-	gg.draw_image(dd.x + (dd.width - 28), dd.y - 3, 28, 28, dd.ui.down_arrow)
 }
 
 pub fn (mut dd Dropdown) add_item(text string) {

examples/android_window.v

@@ -0,0 +1,36 @@
+import ui
+import sokol.sapp
+
+struct App {
+mut:
+	window &ui.Window
+	text   string
+}
+
+fn main() {
+	mut app := &App{
+		window: 0
+		text: 'size= $sapp.dpi_scale() $sapp.width() $sapp.height()'
+	}
+	window := ui.window({
+		title: 'V Android Test'
+		width: 800
+		height: 600
+		state: app
+		mode: .max_size
+	}, [
+		ui.column({
+			widths: ui.stretch
+		}, [
+			ui.textbox(
+				text: &app.text
+				placeholder: '0'
+				// width: 135
+				read_only: true
+			),
+		]),
+	])
+	app.window = window
+	app.text = 'size= ($window.width,$window.height) $sapp.dpi_scale() $sapp.width() $sapp.height()'
+	ui.run(window)
+}