From ded5af83bae21da291d1c161582bae52876c0ffe Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Wed, 15 Nov 2023 23:11:38 +0000 Subject: [PATCH 1/4] Don't use the fat icons for doctabs on mobile, that was apptabs only --- container/doctabs.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/container/doctabs.go b/container/doctabs.go index cb276f6b91..5e3e81d95f 100644 --- a/container/doctabs.go +++ b/container/doctabs.go @@ -168,7 +168,7 @@ func (t *DocTabs) SetItems(items []*TabItem) { // SetTabLocation sets the location of the tab bar func (t *DocTabs) SetTabLocation(l TabLocation) { - t.location = tabsAdjustedLocation(l) + t.location = l t.Refresh() } @@ -319,18 +319,7 @@ func (r *docTabsRenderer) buildTabButtons(count int, buttons *fyne.Container) { buttons.Objects = nil var iconPos buttonIconPosition - if fyne.CurrentDevice().IsMobile() { - cells := count - if cells == 0 { - cells = 1 - } - if r.docTabs.location == TabLocationTop || r.docTabs.location == TabLocationBottom { - buttons.Layout = layout.NewGridLayoutWithColumns(cells) - } else { - buttons.Layout = layout.NewGridLayoutWithRows(cells) - } - iconPos = buttonIconTop - } else if r.docTabs.location == TabLocationLeading || r.docTabs.location == TabLocationTrailing { + if r.docTabs.location == TabLocationLeading || r.docTabs.location == TabLocationTrailing { buttons.Layout = layout.NewVBoxLayout() iconPos = buttonIconTop } else { From f1bb76605ed0e488fdc9fa2a23efc4dd25c9d7e9 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 16 Nov 2023 16:05:18 +0000 Subject: [PATCH 2/4] Updated test data from mobile changes --- .../mobile/change_content_change_hidden.xml | 20 ++++----- .../mobile/change_content_change_visible.xml | 20 ++++----- .../doctabs/mobile/change_content_initial.xml | 20 ++++----- .../mobile/change_icon_change_selected.xml | 42 +++++++----------- .../mobile/change_icon_change_unselected.xml | 42 +++++++----------- .../doctabs/mobile/change_icon_initial.xml | 42 +++++++----------- .../mobile/change_label_change_selected.xml | 20 ++++----- .../mobile/change_label_change_unselected.xml | 20 ++++----- .../doctabs/mobile/change_label_initial.xml | 20 ++++----- .../doctabs/mobile/dynamic_appended.xml | 14 +++--- .../mobile/dynamic_appended_and_removed.xml | 8 ++-- .../mobile/dynamic_appended_another_three.xml | 32 ++++++------- .../doctabs/mobile/dynamic_initial.xml | 8 ++-- .../mobile/dynamic_replaced_completely.xml | 20 ++++----- .../testdata/doctabs/mobile/hover_none.xml | 20 ++++----- .../doctabs/mobile/layout_bottom_ico.xml | 28 ++++++------ .../mobile/layout_bottom_icon_and_text.xml | 30 ++++++------- .../doctabs/mobile/layout_bottom_text.xml | 8 ++-- .../doctabs/mobile/layout_top_icon.xml | 28 ++++++------ .../mobile/layout_top_icon_and_text.xml | 30 ++++++------- .../doctabs/mobile/layout_top_text.xml | 8 ++-- .../doctabs/mobile/tab_location_bottom.xml | 34 +++++++------- .../doctabs/mobile/tab_location_top.xml | 20 ++++----- .../doctabs/mobile/tapped_all_tabs.xml | 32 ++++++------- .../doctabs/mobile/tapped_create_tab.xml | 32 ++++++------- .../doctabs/mobile/tapped_first_selected.xml | 20 ++++----- .../doctabs/mobile/tapped_second_selected.xml | 20 ++++----- .../doctabs/mobile/tapped_third_selected.xml | 26 +++++------ .../testdata/doctabs/mobile/theme_default.png | Bin 2112 -> 2153 bytes .../testdata/doctabs/mobile/theme_ugly.png | Bin 2474 -> 2369 bytes 30 files changed, 320 insertions(+), 344 deletions(-) diff --git a/container/testdata/doctabs/mobile/change_content_change_hidden.xml b/container/testdata/doctabs/mobile/change_content_change_hidden.xml index 300aea2165..3dd8a4f83b 100644 --- a/container/testdata/doctabs/mobile/change_content_change_hidden.xml +++ b/container/testdata/doctabs/mobile/change_content_change_hidden.xml @@ -3,16 +3,16 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text3 diff --git a/container/testdata/doctabs/mobile/change_content_change_visible.xml b/container/testdata/doctabs/mobile/change_content_change_visible.xml index 300aea2165..3dd8a4f83b 100644 --- a/container/testdata/doctabs/mobile/change_content_change_visible.xml +++ b/container/testdata/doctabs/mobile/change_content_change_visible.xml @@ -3,16 +3,16 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text3 diff --git a/container/testdata/doctabs/mobile/change_content_initial.xml b/container/testdata/doctabs/mobile/change_content_initial.xml index 9f24e17f28..1b5b1aa832 100644 --- a/container/testdata/doctabs/mobile/change_content_initial.xml +++ b/container/testdata/doctabs/mobile/change_content_initial.xml @@ -3,16 +3,16 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_change_selected.xml b/container/testdata/doctabs/mobile/change_icon_change_selected.xml index e0456fcfc3..bd61382688 100644 --- a/container/testdata/doctabs/mobile/change_icon_change_selected.xml +++ b/container/testdata/doctabs/mobile/change_icon_change_selected.xml @@ -1,42 +1,34 @@ - - - - - + + + + + - + - - + + - + - - - - - - - - - - - - - + + + + + - - - + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml index d3123d2712..79530754a1 100644 --- a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml +++ b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml @@ -1,42 +1,34 @@ - - - - - + + + + + - + - - + + - + - - - - - - - - - - - - - + + + + + - - - + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_initial.xml b/container/testdata/doctabs/mobile/change_icon_initial.xml index 8777680652..aecf735ec1 100644 --- a/container/testdata/doctabs/mobile/change_icon_initial.xml +++ b/container/testdata/doctabs/mobile/change_icon_initial.xml @@ -1,42 +1,34 @@ - - - - - + + + + + - + - - + + - + - - - - - - - - - - - - - + + + + + - - - + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_change_selected.xml b/container/testdata/doctabs/mobile/change_label_change_selected.xml index 63a6859578..4677f3fea7 100644 --- a/container/testdata/doctabs/mobile/change_label_change_selected.xml +++ b/container/testdata/doctabs/mobile/change_label_change_selected.xml @@ -3,16 +3,16 @@ - - - New 1 - + + + New 1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_change_unselected.xml b/container/testdata/doctabs/mobile/change_label_change_unselected.xml index 11b5e1d393..7bb1918d7d 100644 --- a/container/testdata/doctabs/mobile/change_label_change_unselected.xml +++ b/container/testdata/doctabs/mobile/change_label_change_unselected.xml @@ -3,16 +3,16 @@ - - - New 1 - + + + New 1 + - - New 2 - + + New 2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_initial.xml b/container/testdata/doctabs/mobile/change_label_initial.xml index 9f24e17f28..1b5b1aa832 100644 --- a/container/testdata/doctabs/mobile/change_label_initial.xml +++ b/container/testdata/doctabs/mobile/change_label_initial.xml @@ -3,16 +3,16 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text1 diff --git a/container/testdata/doctabs/mobile/dynamic_appended.xml b/container/testdata/doctabs/mobile/dynamic_appended.xml index 11cd223128..f9ded16d12 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended.xml @@ -4,15 +4,15 @@ - - Test1 - + + Test1 + - - Test2 - + + Test2 + @@ -27,7 +27,7 @@ - + Text 1 diff --git a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml index 59a354a729..df39a97749 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml @@ -4,9 +4,9 @@ - - Test2 - + + Test2 + @@ -21,7 +21,7 @@ - + Text 2 diff --git a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml index b4e262ec87..9d0be92c4e 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml @@ -3,28 +3,28 @@ - - - Test2 - + + + Test2 + - - Test3 - + + Test3 + - - Test4 - + + Test4 + - - Test5 - + + Test5 + @@ -33,8 +33,8 @@ - - + + @@ -47,7 +47,7 @@ - + Text 2 diff --git a/container/testdata/doctabs/mobile/dynamic_initial.xml b/container/testdata/doctabs/mobile/dynamic_initial.xml index 6b79f71956..a93a164b8e 100644 --- a/container/testdata/doctabs/mobile/dynamic_initial.xml +++ b/container/testdata/doctabs/mobile/dynamic_initial.xml @@ -4,9 +4,9 @@ - - Test1 - + + Test1 + @@ -21,7 +21,7 @@ - + Text 1 diff --git a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml index b52b0bad50..4d87866b2a 100644 --- a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml +++ b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml @@ -4,21 +4,21 @@ - - Test6 - + + Test6 + - - Test7 - + + Test7 + - - Test8 - + + Test8 + @@ -33,7 +33,7 @@ - + Text 6 diff --git a/container/testdata/doctabs/mobile/hover_none.xml b/container/testdata/doctabs/mobile/hover_none.xml index 10523657c6..be39e6a4ab 100644 --- a/container/testdata/doctabs/mobile/hover_none.xml +++ b/container/testdata/doctabs/mobile/hover_none.xml @@ -3,16 +3,16 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + @@ -21,8 +21,8 @@ - - + + @@ -35,7 +35,7 @@ - + Text1 diff --git a/container/testdata/doctabs/mobile/layout_bottom_ico.xml b/container/testdata/doctabs/mobile/layout_bottom_ico.xml index ce7b86ee72..1df0bd559d 100644 --- a/container/testdata/doctabs/mobile/layout_bottom_ico.xml +++ b/container/testdata/doctabs/mobile/layout_bottom_ico.xml @@ -1,28 +1,28 @@ - - - - - + + + + + - + - - - - - + + + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml index be9e00add3..a7a8acf5e5 100644 --- a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml +++ b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml @@ -1,29 +1,29 @@ - - - - - Text1 - + + + + + Text1 + - + - - - - - + + + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_bottom_text.xml b/container/testdata/doctabs/mobile/layout_bottom_text.xml index 704d9466a8..6b149f6c06 100644 --- a/container/testdata/doctabs/mobile/layout_bottom_text.xml +++ b/container/testdata/doctabs/mobile/layout_bottom_text.xml @@ -4,9 +4,9 @@ - - Text2 - + + Text2 + @@ -21,7 +21,7 @@ - + diff --git a/container/testdata/doctabs/mobile/layout_top_icon.xml b/container/testdata/doctabs/mobile/layout_top_icon.xml index c2639051ef..087896f2b4 100644 --- a/container/testdata/doctabs/mobile/layout_top_icon.xml +++ b/container/testdata/doctabs/mobile/layout_top_icon.xml @@ -1,28 +1,28 @@ - - - - - + + + + + - + - - - - - + + + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml index 8b50f0680f..f326c67766 100644 --- a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml +++ b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml @@ -1,29 +1,29 @@ - - - - - Text1 - + + + + + Text1 + - + - - - - - + + + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_top_text.xml b/container/testdata/doctabs/mobile/layout_top_text.xml index e2a0b4f244..a5398f6ea0 100644 --- a/container/testdata/doctabs/mobile/layout_top_text.xml +++ b/container/testdata/doctabs/mobile/layout_top_text.xml @@ -4,9 +4,9 @@ - - Text2 - + + Text2 + @@ -21,7 +21,7 @@ - + diff --git a/container/testdata/doctabs/mobile/tab_location_bottom.xml b/container/testdata/doctabs/mobile/tab_location_bottom.xml index 8b4e701db1..956d53ef4f 100644 --- a/container/testdata/doctabs/mobile/tab_location_bottom.xml +++ b/container/testdata/doctabs/mobile/tab_location_bottom.xml @@ -1,48 +1,48 @@ - + - - - - + + + + Test1 - + Test2 - + Test3 - - + + - - - + + + - + - + - - - + + + Text 1 diff --git a/container/testdata/doctabs/mobile/tab_location_top.xml b/container/testdata/doctabs/mobile/tab_location_top.xml index a78ea73487..2f20cf2025 100644 --- a/container/testdata/doctabs/mobile/tab_location_top.xml +++ b/container/testdata/doctabs/mobile/tab_location_top.xml @@ -3,22 +3,22 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml index 94d4bf8792..b07cb0685e 100644 --- a/container/testdata/doctabs/mobile/tapped_all_tabs.xml +++ b/container/testdata/doctabs/mobile/tapped_all_tabs.xml @@ -3,28 +3,28 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + - - Another - + + Another + @@ -33,8 +33,8 @@ - - + + @@ -52,7 +52,7 @@ - + Another Tab diff --git a/container/testdata/doctabs/mobile/tapped_create_tab.xml b/container/testdata/doctabs/mobile/tapped_create_tab.xml index 00e6cb6711..f18434b537 100644 --- a/container/testdata/doctabs/mobile/tapped_create_tab.xml +++ b/container/testdata/doctabs/mobile/tapped_create_tab.xml @@ -3,28 +3,28 @@ - - - Test1 - + + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + - - Another - + + Another + @@ -33,8 +33,8 @@ - - + + @@ -52,7 +52,7 @@ - + Another Tab diff --git a/container/testdata/doctabs/mobile/tapped_first_selected.xml b/container/testdata/doctabs/mobile/tapped_first_selected.xml index 8299dcc854..ce23b17ae3 100644 --- a/container/testdata/doctabs/mobile/tapped_first_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_first_selected.xml @@ -4,21 +4,21 @@ - - Test1 - + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + @@ -38,7 +38,7 @@ - + Text 1 diff --git a/container/testdata/doctabs/mobile/tapped_second_selected.xml b/container/testdata/doctabs/mobile/tapped_second_selected.xml index dd421a8a68..6eb72bf8ef 100644 --- a/container/testdata/doctabs/mobile/tapped_second_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_second_selected.xml @@ -4,21 +4,21 @@ - - Test1 - + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + @@ -38,7 +38,7 @@ - + Text 2 diff --git a/container/testdata/doctabs/mobile/tapped_third_selected.xml b/container/testdata/doctabs/mobile/tapped_third_selected.xml index eb3338ff1e..6eb72bf8ef 100644 --- a/container/testdata/doctabs/mobile/tapped_third_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_third_selected.xml @@ -4,22 +4,22 @@ - - Test1 - + + Test1 + - - Test2 - - + + Test2 + + - - Test3 - - + + Test3 + + @@ -38,9 +38,9 @@ - + - Text 3 + Text 2 diff --git a/container/testdata/doctabs/mobile/theme_default.png b/container/testdata/doctabs/mobile/theme_default.png index f742f4ea0a446d317262f8dab5743c608db5c06a..939c4a293ae6e95553e864a42692577ad3d55ac5 100644 GIT binary patch delta 1850 zcmV-A2gUfn5a|$*B!4hTL_t(|ob23fY!mk#!13SR*|D8C0Yl=n35i37a63Y1S`m-} zAtO<%71h($WhFqGNDw9!Plz{YkO{4tfP|uHd(j8d7etc?iANaH7@`7J){-t#1}d0r zG1ih5Vy9MOI|e_*Ip5vnxTUF;2VWYR{LJt3%IC+w^VQk^%MP7SQB_q11T%J_2SC0n zlK}`Ee{V4+e0G`ot=9@!W{R6Qmf2@2)Gt*nz_1o8uCTChp~n#K&8qyLmgVH>HC=bz z(xmG-mif(&=U#p(Taw_WeRKgwxTq+myWzy1H6^QbaaZ;a`G5Jx&t<(pL3XM-h3$Lb zPy8VtTEbq#Q<}>-6n`qtY6~}hZ47)>k!4`> z+GxMy$HMNRr{UGYQUCZoN1$xY@=Zm{54>-+ z4f@}%eg21rj0eM^U^udMUFH`<0hN+@e`8B70BALe7gsGE4e+vFND!r?XKjsNSG;~F zdHMlBeSN*jWC8%5=UZA@W?r26spKV0Q82Yt1_0?-@815>8?G$L`t=*e*Ei=JJA2QN zoeBUgf9vn=^Jb(fB7zhQ3r!vNx8HpJ-(NhE^+EbH5JfR|K@fyl7iT6fp&>dqf8j(y zGXLZU0H9Gtw@FrHY5<_S&r|t={&)3jtOGvFKL)$|yz<}Ix5VZzvF|@%prSY{`n`BI zNmj(x)>fY91wm+QYnyd(X7Um$6&wIWBvBBee@K5&_^j7GK zC2LnM`S4P|X5=Ea%GOE}~S0Z1&v{{Fn(7l=&0 zNf4p)hV#N_L$y`;JGbU-Ey;eIkd^uWgSdXNUU75OB&axFX4$l77^b!|A0V117#7CH z#e(eAmCvM=8g&{KTU@xbdP^?HFauu(-!-o@=u@+Gs@1vLg6uTA!~gfse}~i5idRdY zS(dKUrKeQBkagp(JCQNH^;+R8FJ*uH?d=Cig05b-L7!S)oT*9S{zaSiUz0r}edo`1 ze@Lh-(Kq}!+TQCQKmVz7A~yVNQ|`oFr2jm4_};`eiEZ%V^*h5A#aX6}&prx85`2ks zpEv|TYPmEJx2DDBsC#|mQRi+r^bPlw(1cp2G8@FZfNEG&QGDae+`IG%ilQ zvsS|?Id;^~(`Vn4AbTy05kwgAjmKRX7!v|xQ%r*WApv0a$uXIm#ki+}$U>8V2N{1; zxLx1Idev@*T-FX<;s;4Cr%{(>^hxJ z6h)uU_Z>z^W-)C-v)RmX8~_|Sa>Qn{b#!z9z}T3)-Qsn1bylnO+O=!*F;p_OX%l+A zU;S8~=lNhTI5IL4TVxofqM~B``t>}|U%h(OYPBj9ikh05?(S~8-3|b0X=&Bf)t7%S zUtYa>b$NNYPN&Pu%d=XoH*enjzTVW+W%lnvX~N^hef#$9+O?~}iI1^|RYA)n7Dcl9NSllS|=oSYn!$y8TYH#9U9eXv5YbLY;k zuCDg>_R`YQy?gie^z>}pxN*;(J(7PUUA%a4`}XZUJw5b6`b5b~SX5LL4u>D_=+Dp3 zFDNL8t*K2-O{Y$ss;sO$dGe&k<9RZpB~y@>P_0(S&W93P9GDQh?D2TqZg);j&f{yy z_d{Mnm&>J6sX9A5!{Kn;O}lsR4g><7ot=jc9ooNteMTjcqVU|ka;x6la}}=Byvxl=iTmvPWnXVhW^cslaL3N olMe_NlMe_NlMe_NlMe_T6l@VIvODW~>i_@%07*qoM6N<$f{Jyk8~^|S delta 1799 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 G_256q6QQvH literal 2474 zcmcK6`9Bkm9|!OycShwHGLrjf5|i+8EXU^hkZVN4k{lT_clbDRgj^+rQ9`a9b7dB0 zNW$FYirn|Lxxan?h416@eLSA8_v`1^Z|_(WV?7`%KPvzL03zVp_y6>p|Av|F&#gu; z-~j*@FNC(1x&OPhY@mtx2zSRh#&67tfd|BfgE1GeNNVwF^^oAp+C~~R@>m~!)mnLU z>yn}F`jZaVeq2}I(xBI^f}u~@b`B}&_=YY-TSAX?RPX+bbEfR*ZVOxDKIjtT^0uk2heO%h_eF5>r z&#;|;1${Lvi{%a(ep?iO(UfQMBK328+m6UZOeQLlVS-M`3|C|vO)z@XDpperj!RKP z=An5%f;S$X*|XfpN(#aSK~G7z>CJLJ0}XO+Zg`9O5}K)-HgMl1WqvS#D^$WF;B%{& z6SC4)wnpa{ro!P!qtS{8{<1SW%pRoy5H`Ns%nv2o3(5xHA2qPxx$bbXd@QYz9dT;l z6~yIullD6ceqK?uHaItlnjIMX9R2c0N{r?rzmihv$9;xp?zcSg6%yrOG^{3i5F*zbn@;6*i+>s zrl%4R=NR>|vbIrgwfhpa?7*up;0}8yht@_$sUDMYnW`gH{`2HuBGGeSD{bM|TfX}v z#I9vN|1x?xkbPHRWgtz=eLR7{nH+qjS9zM0h&v&8%<3ZRQM)!)d?SR*ZadO=$S%{B{Jh?CT?&y<7_~eWOXTODs6Fz?rrAQl2c_w zOQIWRpTk-JhaVNDqvT^8FT(+!=Kxm~N?=y3w+hIi!4{*6SL<}Cz(^oVy)r`^2EE8Q zPkfnc3o5yWikuQ=Y-qwe?k_HSx(+{=DE>~KTa0YSeOP#HWoubd(%if-Wc9paTL?A4 zx2gH|Ab{#RB)UC*H9=uo?>kU-Dsu54?(jwWp$@!=ys(Zu%j@*o8IIFWzhFg?_tV4O zpuQH)8owi?HX6J&WAAp-VHL$awv_3Dt*F(B8#zJEbfsS0JRiKWX3&;-O6$gKMffEl z#VCA!@bgGZm!B#%(Ts{JPnX!ON(o zh?atMS+rP2;X%G!ib+P)8u~dj<6L*oh>Li^tQzjHlCnJunai40CDXHWOJ%Ue4Ae z7A17~u#gOV56tb=o(jFS8OO_fZ=H7fs@)^(Nph@(|0;+7HXX#!Vk7Q|_klRyroNU2 zUWnA>smU)GH4uh;*{KuMz!@f0-YOl%TWDcIPiTWfl zLkW;!206#nCry`;I|K3e_%iAEp0VdaVW)7qhc}`!z8#Oe53XR<4WWEsmFpj2I!unT7M#>*P{niz`>OH;FuXj^StXS_= zX3q2BAi;ayRkVSzV%wq*EGD|r-KU^1Q@3INQ@b36LPf}it#?(o>riC0g!{PY`050v z4vTFSu_|Tm{%$A@VVv=JT4r5EuW9r!2fJ#y8Bh+f@lh9<3%0bhhXGZ%-kEFnWHEgW znS~i3V#)TNP$eZIRS;li%-;A2W!HqPoyZ#~2-!hAag`1me=Vab%L7O(vC76`r*@Sg zC=WTAKNHL#<`l`HWPO`5VJQS#s*B4QbsqZ5jPpuf|LR}Hg>&Dy4MNV|XWel#67P?C zlcu;aUSOi86(7zjjBsRjbFIqNn8uX+9GG^ECr{}ov|MLT?ozYe71ol95-hB)t~3R4 z&Xtyxb%JSKa%~ifZp8x$MZa~v2?xfKc@{tg?}K*qAmst};8{72`6XeWTIU0%?_EjY2*l`V@=HaR|N=mz52mdSEzy z`hE)fmWec1Y+wITgRFU6?cGn&(TakU?6;;#866*Vu}4Fcl=ikeptG}y-}E226w5=Q z&8rjd5?5A^T4BO#d&^|7DnNUFo&>Rzc5SBRm*a3>Zn`RF1A&C~l!o*?|BZOEeV>FV zoIjzYvU0bif)QJ)Bx@)nv{^ew5{OX9{%1yyDLML_n50(ve|F9R0Gyx08c?ju6?o=9 PKNtX^W2{{cvk(6dgConY From 97ae320364e7a55c35d701812ca7b6e7b058f13e Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 16 Nov 2023 16:09:33 +0000 Subject: [PATCH 3/4] Don't change the position logic for now --- container/doctabs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/doctabs.go b/container/doctabs.go index 5e3e81d95f..b1bcf468e3 100644 --- a/container/doctabs.go +++ b/container/doctabs.go @@ -168,7 +168,7 @@ func (t *DocTabs) SetItems(items []*TabItem) { // SetTabLocation sets the location of the tab bar func (t *DocTabs) SetTabLocation(l TabLocation) { - t.location = l + t.location = tabsAdjustedLocation(l) t.Refresh() } From 144d2cfb492e50ba83d2099ca7d167163bd949a5 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 16 Nov 2023 16:18:31 +0000 Subject: [PATCH 4/4] Fixing last mobile tests --- container/doctabs_mobile_test.go | 6 +-- .../doctabs/mobile/tab_location_bottom.xml | 48 +++++++++---------- .../doctabs/mobile/tapped_third_selected.xml | 12 ++--- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/container/doctabs_mobile_test.go b/container/doctabs_mobile_test.go index 10f761e383..034c3ed9cf 100644 --- a/container/doctabs_mobile_test.go +++ b/container/doctabs_mobile_test.go @@ -347,11 +347,11 @@ func TestDocTabs_Tapped(t *testing.T) { require.Equal(t, 0, tabs.SelectedIndex()) test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_first_selected.xml", c) - test.TapCanvas(c, fyne.NewPos(120, 10)) + test.TapCanvas(c, fyne.NewPos(100, 10)) assert.Equal(t, 1, tabs.SelectedIndex()) test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_second_selected.xml", c) - test.TapCanvas(c, fyne.NewPos(240, 10)) + test.TapCanvas(c, fyne.NewPos(180, 10)) assert.Equal(t, 2, tabs.SelectedIndex()) test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_third_selected.xml", c) @@ -359,7 +359,7 @@ func TestDocTabs_Tapped(t *testing.T) { require.Equal(t, 0, tabs.SelectedIndex()) test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_first_selected.xml", c) - test.TapCanvas(c, fyne.NewPos(330, 10)) + test.TapCanvas(c, fyne.NewPos(320, 10)) require.Equal(t, 3, tabs.SelectedIndex()) test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_create_tab.xml", c) diff --git a/container/testdata/doctabs/mobile/tab_location_bottom.xml b/container/testdata/doctabs/mobile/tab_location_bottom.xml index 956d53ef4f..0efc29f7c5 100644 --- a/container/testdata/doctabs/mobile/tab_location_bottom.xml +++ b/container/testdata/doctabs/mobile/tab_location_bottom.xml @@ -1,48 +1,48 @@ - + - - - - - - Test1 - + + + + + + Test1 + - - Test2 - + + Test2 + - - Test3 - + + Test3 + - - + + - - - + + + - + - + - - - + + + Text 1 diff --git a/container/testdata/doctabs/mobile/tapped_third_selected.xml b/container/testdata/doctabs/mobile/tapped_third_selected.xml index 6eb72bf8ef..71ea3ea207 100644 --- a/container/testdata/doctabs/mobile/tapped_third_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_third_selected.xml @@ -11,15 +11,15 @@ - Test2 + Test2 - + - Test3 + Test3 - + @@ -38,9 +38,9 @@ - + - Text 2 + Text 3