diff --git a/Cargo.lock b/Cargo.lock
index e7cc1a013..fbec771af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "accessory"
@@ -219,7 +219,7 @@ dependencies = [
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "arrayvec"
@@ -239,7 +239,7 @@ checksum = "9dbc3a507a82b17ba0d98f6ce8fd6954ea0c8152e98009d36a40d8dcc8ce078a"
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "libloading 0.8.9",
 ]
@@ -692,7 +692,7 @@ dependencies = [
 [[package]]
 name = "bit-set"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bit-vec",
 ]
@@ -700,12 +700,12 @@ dependencies = [
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "bitflags"
@@ -854,7 +854,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "bytemuck"
@@ -871,7 +871,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "bytes"
@@ -939,7 +939,7 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "cfg_aliases"
@@ -950,7 +950,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "chacha20"
@@ -1323,7 +1323,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "crunchy"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "crypto-bigint"
@@ -1728,7 +1728,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "dunce"
@@ -1888,7 +1888,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 [[package]]
 name = "equivalent"
 version = "1.0.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "errno"
@@ -2071,7 +2071,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 [[package]]
 name = "foldhash"
 version = "0.2.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "foreign-types"
@@ -2227,9 +2227,9 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
- "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
 ]
 
 [[package]]
@@ -2435,9 +2435,9 @@ dependencies = [
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
- "foldhash 0.2.0 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "foldhash 0.2.0 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
 ]
 
 [[package]]
@@ -2488,7 +2488,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "hilog-sys"
@@ -2927,10 +2927,10 @@ dependencies = [
 [[package]]
 name = "indexmap"
 version = "2.13.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
- "equivalent 1.0.2 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
- "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "equivalent 1.0.2 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
+ "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
 ]
 
 [[package]]
@@ -3137,9 +3137,9 @@ dependencies = [
 [[package]]
 name = "libloading"
 version = "0.8.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "windows-link 0.2.1",
 ]
 
@@ -3287,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -3295,12 +3295,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-code-language",
  "makepad-widgets",
@@ -3309,7 +3309,7 @@ dependencies = [
 [[package]]
 name = "makepad-code-language"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "pulldown-cmark 0.12.2",
 ]
@@ -3317,7 +3317,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3325,7 +3325,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -3334,7 +3334,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3352,7 +3352,7 @@ dependencies = [
  "sdfer",
  "serde",
  "ttf-parser",
- "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "unicode-linebreak",
  "unicode-segmentation 1.12.0",
 ]
@@ -3360,7 +3360,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3368,12 +3368,12 @@ dependencies = [
 [[package]]
 name = "makepad-fast-inflate"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-git",
 ]
@@ -3381,17 +3381,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "weezl",
 ]
@@ -3399,7 +3399,7 @@ dependencies = [
 [[package]]
 name = "makepad-git"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-fast-inflate",
 ]
@@ -3407,10 +3407,10 @@ dependencies = [
 [[package]]
 name = "makepad-half"
 version = "2.7.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
- "crunchy 0.2.4 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
+ "crunchy 0.2.4 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "num-traits 0.2.20",
  "zerocopy 0.8.39",
 ]
@@ -3418,7 +3418,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3432,7 +3432,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "ttf-parser",
 ]
@@ -3440,7 +3440,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3449,7 +3449,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3457,7 +3457,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3465,7 +3465,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3473,12 +3473,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3487,7 +3487,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3495,7 +3495,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3509,12 +3509,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "ash",
  "bitflags 2.10.0",
@@ -3539,7 +3539,7 @@ dependencies = [
  "napi-derive-ohos",
  "napi-ohos",
  "ohos-sys",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "wayland-client",
  "wayland-egl",
  "wayland-protocols",
@@ -3551,7 +3551,7 @@ dependencies = [
 [[package]]
 name = "makepad-platform-video"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-apple-sys",
  "makepad-objc-sys",
@@ -3561,12 +3561,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3575,13 +3575,13 @@ dependencies = [
  "makepad-regex",
  "makepad-script-derive",
  "makepad-stitch",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
 ]
 
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3589,7 +3589,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3598,17 +3598,17 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-stitch"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
  "makepad-error-log",
@@ -3620,7 +3620,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3629,7 +3629,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3638,7 +3638,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3647,7 +3647,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3655,7 +3655,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3670,7 +3670,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-error-log",
  "makepad-zune-core",
@@ -3679,12 +3679,12 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "simd-adler32",
 ]
@@ -3692,7 +3692,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3700,7 +3700,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-fast-inflate",
  "makepad-zune-core",
@@ -3710,7 +3710,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -4093,7 +4093,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "memoffset"
@@ -4165,20 +4165,20 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "27.0.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "arrayvec 0.7.6",
  "bit-set",
  "bitflags 2.10.0",
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
- "cfg_aliases 0.2.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
- "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
+ "cfg_aliases 0.2.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
+ "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "hexf-parse",
  "indexmap 2.13.0",
  "makepad-error-log",
  "makepad-half",
  "num-traits 0.2.20",
- "once_cell 1.21.3 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "once_cell 1.21.3 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "rustc-hash 1.1.0",
  "spirv",
  "thiserror 2.0.18",
@@ -4337,7 +4337,7 @@ dependencies = [
 [[package]]
 name = "num-traits"
 version = "0.2.20"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "num_cpus"
@@ -4501,7 +4501,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 [[package]]
 name = "once_cell"
 version = "1.21.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -4773,7 +4773,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "polling"
@@ -4921,10 +4921,10 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
- "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "unicase 2.9.0",
 ]
 
@@ -5716,7 +5716,7 @@ dependencies = [
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "rustc-hash"
@@ -5841,12 +5841,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck 1.25.0",
  "makepad-error-log",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "ttf-parser",
  "unicode-bidi-mirroring",
  "unicode-ccc",
@@ -5944,7 +5944,7 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "scopeguard"
@@ -5955,7 +5955,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "sealed"
@@ -6285,7 +6285,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "siphasher"
@@ -6311,7 +6311,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "socket2"
@@ -6335,7 +6335,7 @@ dependencies = [
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
 ]
@@ -6697,7 +6697,7 @@ dependencies = [
 [[package]]
 name = "thiserror"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "thiserror-impl 2.0.18",
 ]
@@ -6725,7 +6725,7 @@ dependencies = [
 [[package]]
 name = "thiserror-impl"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -7109,7 +7109,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "tungstenite"
@@ -7172,7 +7172,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-bidi"
@@ -7183,17 +7183,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-ident"
@@ -7204,12 +7204,12 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-ident"
 version = "1.0.22"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-normalization"
@@ -7229,17 +7229,17 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "unicode-segmentation"
@@ -7540,10 +7540,10 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "downcast-rs",
- "scoped-tls 1.0.1 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "scoped-tls 1.0.1 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
  "smallvec 1.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-sys",
 ]
@@ -7551,7 +7551,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -7561,7 +7561,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7570,7 +7570,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -7580,10 +7580,10 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "makepad-error-log",
- "pkg-config 0.3.32 (git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen)",
+ "pkg-config 0.3.32 (git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw)",
 ]
 
 [[package]]
@@ -7631,7 +7631,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "whoami"
@@ -7694,7 +7694,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7713,7 +7713,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7746,7 +7746,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7767,7 +7767,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7831,7 +7831,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "windows-numerics"
@@ -7875,7 +7875,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -8286,7 +8286,7 @@ dependencies = [
 [[package]]
 name = "zerocopy"
 version = "0.8.39"
-source = "git+https://github.com/kevinaboos/makepad?branch=wayland_restore_maximized_not_fullscreen#33a59fb32eb2db508155f4f38bad9bd9113f10b1"
+source = "git+https://github.com/kevinaboos/makepad?branch=tooltip_move_after_draw#e215415ab365f59529165b811ad31131e4c2eced"
 
 [[package]]
 name = "zerocopy-derive"
diff --git a/Cargo.toml b/Cargo.toml
index e6b7f1ed6..b4df2dc89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,8 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 # makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
 # makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "wayland_restore_maximized_not_fullscreen", features = ["serde"] }
-makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "wayland_restore_maximized_not_fullscreen" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "tooltip_move_after_draw", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "tooltip_move_after_draw" }
 
 
 robius-directories = { git = "https://github.com/project-robius/robius" }
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index cf3a20922..788c5f708 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -1077,10 +1077,19 @@ impl Widget for RoomScreen {
                 // Handle a hover-out action on the reaction list or avatar row.
                 let avatar_row_ref = wr.avatar_row(cx, ids!(avatar_row));
                 if (reaction_list.hovered_out(actions) || avatar_row_ref.hover_out(actions))
-                    // Don't hover out if any current actions are about to hover in and show the tooltip.
-                    && !actions.iter().any(|a| matches!(
-                        a.as_widget_action().and_then(|wa| wa.action.downcast_ref::<TooltipAction>()),
-                        Some(TooltipAction::HoverIn { .. })
+                    // Don't hover out if any current actions are about to hover in and show any tooltip.
+                    // This prevents a brief flicker when hovering out of one tooltip to hovering into another one immediately.
+                    && !actions.iter().any(|a| a.as_widget_action().is_some_and(|wa|
+                        matches!(
+                            wa.action.downcast_ref::<TooltipAction>(),
+                            Some(TooltipAction::HoverIn { .. }),
+                        )
+                        || matches!(
+                            wa.action.downcast_ref::<RoomScreenTooltipActions>(),
+                            Some(RoomScreenTooltipActions::HoverInReactionButton { .. }
+                                | RoomScreenTooltipActions::HoverInReadReceipt { .. }
+                            ),
+                        )
                     ))
                 {
                     cx.widget_action(
@@ -1864,7 +1873,7 @@ impl RoomScreen {
                             log!("process_timeline_updates(): jumping view from event index {curr_item_idx} to new index {new_item_idx}, scroll {new_item_scroll}, event ID {_event_id}");
                             portal_list.set_first_id_and_scroll(new_item_idx, new_item_scroll);
                             // Hide the tooltip when the timeline jumps, as a hover-out event won't occur.
-                            cx.widget_action(ui,  RoomScreenTooltipActions::HoverOut);
+                            cx.widget_action(ui, TooltipAction::HoverOut);
                         }
                     }
                     else if curr_first_id > new_items.len() {
diff --git a/src/room/room_tab_hover_card.rs b/src/room/room_tab_hover_card.rs
index 195ccfdbf..629452ec5 100644
--- a/src/room/room_tab_hover_card.rs
+++ b/src/room/room_tab_hover_card.rs
@@ -14,9 +14,6 @@ script_mod! {
         width: Fill, height: Fill
         flow: Overlay
         tooltip := Tooltip {
-            clip_x: false
-            clip_y: false
-
             content := RoundedShadowView {
                 width: 272,
                 // Note: this height value is set dynamically in `show_for_hovered_tab()`,
@@ -253,7 +250,7 @@ impl RoomTabHoverCard {
             self.drawn_content = Some((tab_id, name.clone(), avatar_data));
         }
 
-        // set up all the layout parameters, width, height, position (w/ padding/margin spacing).
+        // set up all the layout parameters, width and height (w/ padding/margin spacing).
         let bounds = cx.get_window_id_of(&self.view.area()).map_or_else(
             || self.view.area().rect(cx),
             |window_id| Rect{pos: Vec2d::default(), size: cx.windows[window_id].get_inner_size()},
@@ -269,24 +266,20 @@ impl RoomTabHoverCard {
                 cx, 0.0, 0.0, Some((text_width / scale) as f32), true, label.align, &name,
             ).size_in_lpxs.height as f64 * scale
         });
-        let available_height = (bounds.size.y - 2.0 * gap - 3.0).max(1.0);
+        let available_height = (bounds.size.y - 2.0 * gap).max(1.0);
         let height = (24.0 + text_height.ceil().max(44.0)).min(available_height);
         let content = tooltip.view(cx, ids!(content));
         if let Some(mut content) = content.borrow_mut() {
             content.walk.width = Size::Fixed(width);
             content.walk.height = Size::Fixed(height);
         }
-        let left = bounds.pos.x + gap;
-        let right = (bounds.pos.x + bounds.size.x - width - gap).max(left);
-        let top = bounds.pos.y + gap;
-        let bottom = (bounds.pos.y + bounds.size.y - height - gap - 3.0).max(top);
-        let pos = dvec2(
-            (tab_rect.pos.x + tab_rect.size.x * 0.5 - width * 0.5).clamp(left, right),
-            (tab_rect.pos.y + tab_rect.size.y + gap).clamp(top, bottom),
-        );
         tooltip.label(cx, ids!(tooltip_label)).set_text(cx, &name);
-        tooltip.set_pos(cx, pos);
-        tooltip.show(cx);
+        tooltip.show_anchored(cx, TooltipAnchor {
+            rect: tab_rect,
+            side: TooltipPosition::Bottom,
+            gap,
+            natural_width: None,
+        });
         self.is_open = true;
         self.anchor_rect = Some(tab_rect);
     }