Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false. #3019

BDisp · 2023-11-29T01:06:18Z

Fixes #3017 - This PR highlights and clarifies how the LayoutStyle differs from each other and how they are actually managed by the LayoutSubViews method, where the SetRelativeLayout method is only executed if the View is LayoutStyle.Computed. Faced with this reality, unit tests must also faithfully simulate exactly how the application behaves.
I also restored broken unit tests.

Pull Request checklist:

I've named my PR in the form of "Fixes #issue. Terse description."
My code follows the style guidelines of Terminal.Gui - if you use Visual Studio, hit CTRL-K-D to automatically reformat your files before committing.
My code follows the Terminal.Gui library design guidelines
I ran dotnet test before commit
I have made corresponding changes to the API documentation (using /// style comments)
My changes generate no new warnings
I have checked my code and corrected any poor grammar or misspellings
I conducted basic QA to assure all features are working

…tical direction instance with AutoSize as false.

Terminal.Gui/Text/TextFormatter.cs

UnitTests/Application/MouseTests.cs

Terminal.Gui/Views/CheckBox.cs

Terminal.Gui/Views/DateField.cs

Terminal.Gui/Views/TimeField.cs

Terminal.Gui/Views/Toplevel.cs

@BDisp

…fy (gui-cs#2927) * Adds basic MainLoop unit tests * Remove WinChange action from Curses * Remove WinChange action from Curses * Remove ProcessInput action from Windows MainLoop * Simplified MainLoop/ConsoleDriver by making MainLoop internal and moving impt fns to Application * Modernized Terminal resize events * Modernized Terminal resize events * Removed un used property * for _isWindowsTerminal devenv->wininit; not sure what changed * Modernized mouse/keyboard events (Action->EventHandler) * Updated OnMouseEvent API docs * Using WT_SESSION to detect WT * removes hacky GetParentProcess * Updates to fix gui-cs#2634 (clear last line) * removes hacky GetParentProcess2 * Addressed mac resize issue * Addressed mac resize issue * Removes ConsoleDriver.PrepareToRun, has Init return MainLoop * Removes unneeded Attribute methods * Removed GetProcesssName * Removed GetProcesssName * Refactored KeyEvent and KeyEventEventArgs into a single class * Revert "Refactored KeyEvent and KeyEventEventArgs into a single class" This reverts commit 88a0065. * Fixed key repeat issue; reverted stupidity on 1049/1047 confusion * Updated CSI API Docs * merge * Rearranged Event.cs to Keyboard.cs and Mouse.cs * Renamed KeyEventEventArgs KeyEventArgs * temp renamed KeyEvent OldKeyEvent * Merged KeyEvent into KeyEventArgs * Renamed Application.ProcessKey members * Renamed Application.ProcessKey members * Renamed Application.ProcessKey members * Added Responder.KeyPressed * Removed unused references * Fixed arg naming * InvokeKeybindings->InvokeKeyBindings * InvokeKeybindings->InvokeKeyBindings * Fixed unit tests fail * More progress on refactoring key input; still broken and probably wrong * Moved OnKeyPressed out of Responder and made ProcessKeyPrssed non-virtual * Updated API docs * Moved key handling from Responder to View * Updated API docs * Updated HotKey API docs * Updated shortcut API docs * Fixed responder unit tests * Removed Shortcut from View as it is not used * Removed unneeded OnHotKey override from Button * Fixed BackTab logic * Button now uses Key Bindings exclusively * Button now uses Key Bindings exclusively * Updated keyboard.md docs * Fixed unit tests to account for Toplevel handling default button * Added View.InvokeCommand API * Modernized RadioGroup * Removed ColdKey * Modernized (partially) StatusBar * Worked around FileDialog issue with Ctrl-F * Fixed driver unit test; view must be focused to reciev key pressed * Application code cleanup * Start on updaing menu * Menu now mostly works * Menu Select refinement * Fixed known menu bugs! * Enabled HotKey to cause focus- experimental * Fixes gui-cs#3022 & adds unit test to prove it * Actually Fixes gui-cs#3022 & adds unit test to prove it * Working through hotkey issues * Misc fixes * removed hot/cold key stuff from Keys scenario * Fixed scenarios * Simplified shortcut string handling * Modernized Checkbox * Modernized TileView * Updated API docs * Updated API docs * attempting to publish v2 docs * Revert "attempting to publish v2 docs" This reverts commit 59dcec1. * Playing with api docs * Removed Key.BackTab * Removed Caps/Scroll/Numlock * Partial removal of keymodifiers - unit tests pass * Partial removal of keymodifiers - broke netdriver somewhere * WindowsDriver & added KeyEventArgsTests * Fixing menu shortcut/hotkeys - broke Menu.cs into separate files * Fixed MenuBar! * Finished modernizing Menu/MenuBar * Removed Key.a-z. Broke lots of stuff * checkout@v4 * progress on key mapping and formatting * VK tests are still failing * Fixed some unit tests * Added Hotkey and Keybinding unit tests * fixed unit test * All unit tests pass again... * Fixed broken unit tests * KeyEventArgs.KeyValue -> AsRune * Fixed bugs. Still some broken * Added KeyEventArgs.IsAlpha. Added KeyEventArgs.cast ops. Fixed bugs. Unit tests pass * Fixed WindowsDriver * Oops. * Refactoring based on bdisp's help. Not complete! * removed calling into subviews from OnKeyBindings * removed calling into subviews from OnKeyBindings * Improved View KeyEvent unit tests * More hotkey unit tests * BIg change - Got rid of KeyPress w/in Application/Drivers * Unit tests now pass again * Refreshed API docs * Better HotKey logic. More progress. Getting close. * Fixed handling of shifted chars like ö * Minor code cleanup * Minor code cleanup2 * Why is build Action failing? * Why is build Action failing?? * upgraded to .net8 to try to fix weird CI/CD build errors * upgraded to .net8 to try to fix weird CI/CD build errors2 * Disabling TextViewTests to diagnose build errors * reenable TextViewTests to diagnose build errors * Arrrrrrg * Merged v2_develop * Fixed uppercase accented keys in WindowsDriver * Fixed key binding api docs * Experimental impl of CommandScope.SubViews for MenuBar * Removed dead code from application.cs * Removed dead code from application.cs * Removed dead code from ConsoleDriver.cs * Cleaned up some key binding stuff * Disabled Alt to activate menu for now * Updated label commands * Fixed menu bugs. Upgraded menu unit tests * Fixed unit tests * Working on NetDriver * fixed netdriver * Fixed issues called out by @BDisp CR * fixed CursesDriver * added todo to netdriver * Cherry picked treeview test fix 1b415e5 * Fix NetDriver. * CommandScope->KeyBindingScope * Address some tznind feedback * Refactored KeyBindings big time! * Added key consts to KeyEventArgs and renamed Key to ConsoleDriverKey * Fixed some API docs * Moved ConsoleDriverKey to ConsoleDriver.cs * Renamed Key->ConsoleDriverKey * Renamed Key->ConsoleDriverKey * Renamed Key->ConsoleDriverKey * renamed file I forgot to rename before * Updated name and API docs of KeyEventArgs.isAlpha * Fixed issues with OnKeyUp not doing the right thing. * Fixed MainLoop.Running never being used * Fixed MainLoop.Running never being used - unit tests * Claned up BUGBUG comments * Disabled a unit test to see why ci/cd tests are failing * Removed defunct commented code * Removed more defunct commented code * Re-eanbled unit test; jsut removing one test case... * Disabled more... * Renambed Global->Applicaton and updated scope API docs * Disabled more unit tests... * Removed dead code * Disabled more unit tests...2 * Disabled more unit tests...3 * Renambed Global->Applicaton and updated scope API docs 2 * Added more KeyBinding scope tests * Added more KeyBinding scope tests2 * ConsoleDriverKey too long. Key too ambiguous. Settled on KeyCode. (Partialy because eventually I want to intro a class named Key). * KeyEventArgs improvements. cast to Rune must be explicit as it's lossy * Fixed warnings * Renamed KeyEventArgs to Key... progress on fixing broken stuff that resulted * Fix ConsoleKeyMapping bugs. * Fix NetDriver issue from converting a lower case to a upper case. * Started migration to Key from KeyCode - e.g. made HotKeys all consistent. * Fixed build warnings * Added key defns to Key * KeyBindings now uses Key vs. KeyCode * Verified by tweaking UICatalog * Fixed treeview test ... again * Renamed ProcessKeyDown/Up to NewKeyDown/Up and OnKeyPressed to OnProcessKeyDown to make things more clear * Added test AllViews_KeyDown_All_EventsFire unit tests and fixed a few Views that were wrong * fixed stupid KeyUp event bug * If key not handled, return false for datefield * dotnet test --no-restore --verbosity diag * dotnet test --blame * run tests on windows * Fix TestVKPacket unit test and move it to ConsoleKeyMappingTests.cs file. * Remove unnecessary commented code. * Tweaked unit tests and removed Key.BareKey * Fixed little details and updated api docs * updated api docs * AddKeyBindingsForHotKey: KeyCode->Key * Cleaned up more old KeyCode usages. Added TODOs --------- Co-authored-by: BDisp <bd.bdisp@gmail.com>

* Simplifies Key.IsValid * Updated unit tests * Fixed menu

* Updated overview docs * Updated toc * Updated docs more

…ned Attribute.Default in Attribute class (v2) (gui-cs#3091)

…ui-cs#3067) Co-authored-by: Tig <tig@users.noreply.github.com>

…3077) * Updated overview docs * Updated toc * Updated docs more * Updated yml via dependabot * Initial work in progress * Fixed some autosize things * Revamped Pos / Dim API docs * Removed margin * horiz->width * Updated MessageBoxes and Dialogs Scenarios to use AutoSize * AutoSize->Auxo * Adds validation * prep for Dialog to use Dim.Auto - Simplify unit tests to not depend on things not important to the unit test (like Dialog) * prep for Dialog to use Dim.Auto - Simplify unit tests * prep for Dialog to use Dim.Auto - Simplify unit tests * prep for Dialog to use Dim.Auto - Make Dialog tests not depend on MessageBox * Started on DimAuto unit tests * started impl on min/max. * started impl on min/max. * Added DimAutoStyle * Added arg checking for not implemented features * Temporarily made DimAutoStyle.Subviews default * Removed unneeded override of Anchor * Fixed GethashCode warning * Implemented DimAuto(min) * Fixed unit tests * renamed scenario * WIP * Moved ViewLayout.cs into Layout folder * Clean up cocde formatting * Renamed and moved SetFrameToFitText * Fixed API docs for SetRelativeLayout * Factored out SetRelativeLayout tests * Better documented existing SetRelativeLayout behavior + unit tess * Debugging Pos.Center + x in SetRelativeLayout - WIP * Progress on low level unit tess * Initial commit * Restored unmodified scenarios * Bump deps

…rrect (gui-cs#3089) * Removed char->Key cast. Added Key(char) * Re-added char->key cast. Added unit tests * Fixed standard keys to always return new instead of being readonly * Re-fixed WindowsDriver to report shift/alt/ctrl as key/down/up * Re-fixed WindowsDriver to report shift/alt/ctrl as key/down/up * Adds string constructor to Key + tests. * Simplified Key json * Added string/Key cast operators.

BDisp · 2024-01-05T01:51:03Z

@tig I'll give up trying to fix this because I' tired always resolving conflicts to nothing and become broken again, sorry.

tig · 2024-01-05T05:25:07Z

@tig I'll give up trying to fix this because I' tired always resolving conflicts to nothing and become broken again, sorry.

Sorry you're tired and annoyed.

One thing to consider here is View.AutoSize will likely go away if I can get Dim.Auto to work.

BDisp · 2024-01-05T09:40:51Z

But absolute layout is broken on the View constructor when you initialize with a frame and then OnResizeNeeded change the frame again.

…uences (gui-cs#3094) * Fixes gui-cs#2616. Support combining sequences that don't normalize * Decouples Application from ConsoleDriver in TestHelpers * Updates driver tests to match new arch * Start on making all driver tests test all drivers * Improves handling if combining marks. * Fix unit tests fails. * Fix unit tests fails. * Handling combining mask. * Tying to fix this unit test that sometimes fail. * Add support for combining mask on NetDriver. * Enable CombiningMarks as List<Rune>. * Prevents combining marks on invalid runes default and space. * Formatting for CI tests. * Fix non-normalized combining mark to add 1 to Col. * Reformatting for retest the CI. * Forces non-normalized CMs to be ignored. * Initial experiment * Created ANSiDriver. Updated UI Catalog command line handling * Fixed ForceDriver logic * Fixed ForceDriver logic * Updating P/Invoke * Force16 colors WIP * Fixed 16 colo mode * Updated unit tests * UI catalog tweak * Added chinese scenario from bdisp * Disabled AnsiDriver unit tests for now. * Code cleanup * Initial commit (fork from v2_fixes_2610_WT_VTS) * Code cleanup * Removed nativemethods.txt * Removed not needed native stuff * Code cleanup * Ensures command line handler doesn't eat exceptions --------- Co-authored-by: BDisp <bd.bdisp@gmail.com>

… aren't cleared on others unit tests classes.

BDisp · 2024-01-05T12:48:33Z

@tig I'll give up trying to fix this because I' tired always resolving conflicts to nothing and become broken again, sorry.

Sorry you're tired and annoyed.

Sorry for that. But I really had resolved many times conflicts on this and I think I missed some of my toughs. When you ask to me to stop on some pull request because we both are working on the same files, I understand and I stop from pushing anything more.

One thing to consider here is View.AutoSize will likely go away if I can get Dim.Auto to work.

I think you are in the right way, but if this PR fix something related with the TextDirection at initialization and is good to merge, then you can continue work on your PR after merged. By the way, if you want to ensure that the Dim.Auto will work properly, my PR has unit tests that can be used to ensure that it really work, otherwise something is wrong.

tig · 2024-01-08T08:58:18Z

@BDisp - I forgot about this as I was working on the fix for #3127 (#3130).

I think I fixed all of this there!!!

I'll pour over this asap to see if I missed anything. As you review #3130, please let me know if you see anything I missed.

tig · 2024-01-08T18:54:36Z

We can close this now. I've carefully merged all of these excellent fixes (with appropriate changes) into #3130.

I'll push to that PR soon you you can see!

…e find a use-case where someone wants to override it we can change this back.

BDisp · 2024-01-08T19:50:05Z

UnitTests/View/ViewTests.cs

+		[Theory, AutoInitShutdown]
+		[InlineData (true)]
+		[InlineData (false)]
+		public void View_Draw_Vertical_Simple_TextAlignments (bool autoSize)


@tig this test you can't successful reproduce on your PR #3130.

I don't know what you mean. I moved that test to #3130 and it passes.

Ops I didn't pull, sorry. Confirmed thanks.

…works. Fixes `AutoSize` etc... (#3130) * Removes CheckAbsoulte and updates unit tests to match * Fixed code that was dependent on ToString behavior vs. direct test for null * Dim/Pos != null WIP * Moved AutoSize specific tests out of Pos/Dim tests * Broke out AutoSize = false tests to new file * Commented test TODOs * New test * Removed unused API and cleaned up code * Removed unused API and cleaned up code * Cleaned up code * Cleaned up code * reorg'd Toplevel tests * Fixed Create and related unit tests * Added test from #3136 * Removed TopLevel.Create * Fixed SetCurrentOverlappedAsTop * Updated pull request template * Updated pull request template * Revert "Updated pull request template" This reverts commit d807190. * reverting * re-reverting * Fixed every thing but autosize scenarios?? * Fixed hexview * Fixed contextmenu * Fixed more minor issues in tests * Fixed more minor issues in tests * Debugging Dialog test failure * Fixed bad Dialog test. Was cleary invalid * Fixed OnResizeNeeded bug * Fixed OnResizeNeeded bug * Fixed UICatalog to not eat exceptions * Fixed TextView * Removed Frame overrides * Made Frame non-virtual * Fixed radioGroup * Fixed TabView * Hcked ScrolLBarView unit tests to pass * All AutoSize tests pass! * All tests pass!!!!!!! * Updated API docs. Cleaned up code. * Fixed ColorPicker * Added 'Bounds =' unit tests * Refactored TextFormatter.Size setting logic * Cleaned up OnResizeNeeded (api docs and usages) * Merges in #3019 changes. Makes OnResizeNeeded non-virtual. If we find a use-case where someone wants to override it we can change this back. * Fixed FileDialog bounds warning * Removed resharper settings from editorconfig * Added Pos.Center test to AllViewsTests.cs. Modernized RadioGroup. Fixed ProgressBar. * Reverted formatting * Reverted formatting * Reverted formatting * Reverted formatting * Reverted formatting * Reverted formatting * Reverted formatting * Code cleanup * Code cleanup * Code cleanup * Code cleanup * Code cleanup * Code cleanup * Code cleanup * Code cleanup * Reverted formatting

BDisp added 5 commits November 28, 2023 21:16

Using Frame to force read from the get method.

5d5d32d

Fix some issues with AutoSize and ForceValidatePosDim.

c72ad5b

Fixing broken unit tests.

fc2e69b

Restoring code I've broken.

9e9bf1a

BDisp requested a review from tig as a code owner November 29, 2023 01:06

BDisp added 5 commits November 29, 2023 16:42

Removing forgotten code.

fcd221e

Only LayoutStyle.Computed can change the Frame.

60bdd96

DateField and TimeField depends on LayoutStyle.Computed.

73de270

Fix unit tests related with LayoutStyle.

c084309

Merge branch 'v2_develop' into v2_textdirection-vertical-autosize_3017

a72f79c

tig requested changes Dec 4, 2023

View reviewed changes

Terminal.Gui/Text/TextFormatter.cs Outdated Show resolved Hide resolved

BDisp added 3 commits December 4, 2023 15:07

Prevents a user to set TextDirection to -1.

4596b62

Prevents any invalid TextDirection value.

644a78f

Trying to fix the TestTreeViewColor unit test fail.

cafeae5

tig requested changes Dec 5, 2023

View reviewed changes

Terminal.Gui/Text/TextFormatter.cs Outdated Show resolved Hide resolved

Removes (TextDirection)(-1).

87077b7

BDisp commented Dec 5, 2023

View reviewed changes

UnitTests/Application/MouseTests.cs Outdated Show resolved Hide resolved

tig requested changes Dec 5, 2023

View reviewed changes

Terminal.Gui/Views/CheckBox.cs Outdated Show resolved Hide resolved

Terminal.Gui/Views/DateField.cs Outdated Show resolved Hide resolved

Terminal.Gui/Views/TimeField.cs Outdated Show resolved Hide resolved

Terminal.Gui/Views/Toplevel.cs Outdated Show resolved Hide resolved

BDisp and others added 11 commits December 5, 2023 22:06

Removes unnecessary TextDirection initialization.

7668a7d

Removes LayoutStyle.

318b4ad

Merge branch 'v2_develop' into v2_textdirection-vertical-autosize_3017

bcc22b9

Attempting to publish v2 docs via repository_dispatch

9920d1f

Attempting to publish v2 docs via repository_dispatch2

d81bafb

Attempting to publish v2 docs via repository_dispatch3

ad35f02

Trying github.ref_name

d29eaa4

created token

a863bf8

Fixes gui-cs#3055: Remove Key.Unknown (gui-cs#3057)

b7eeab6

* Simplifies Key.IsValid * Updated unit tests * Fixed menu

Updates V2 API docs (gui-cs#3060)

9f24848

* Updated overview docs * Updated toc * Updated docs more

BDisp and others added 10 commits December 29, 2023 20:59

Fixes gui-cs#3064. Pos.View returns PosCombine (gui-cs#3065)

d594b9e

Fix MouseEvent.ToString() (gui-cs#3068)

225cb38

Fixes gui-cs#3080. Potentially unintended behavior of static pre-defi…

e12349a

…ned Attribute.Default in Attribute class (v2) (gui-cs#3091)

Support for publishing UICatalog as single file (gui-cs#3074)

f7afb49

Fixes gui-cs#3066. The last RunIteration only work on WindowsDriver (g…

3a3dd56

…ui-cs#3067) Co-authored-by: Tig <tig@users.noreply.github.com>

Resolving merge conflicts.

fe743df

Fix merge errors.

02651fc

Resolving merge conflicts.

955b224

tig approved these changes Jan 5, 2024

View reviewed changes

Merge branch 'v2_develop' into v2_textdirection-vertical-autosize_3017

31bf5bf

tig and others added 4 commits January 5, 2024 12:21

Only call OnResizeNeeded if it's LayoutStyle.Computed.

8fc0fd4

Merge branch 'v2_develop' into v2_textdirection-vertical-autosize_3017

6cda1cc

Fix Disposing unit tests that sometimes throws because some instances…

d8347ac

… aren't cleared on others unit tests classes.

This was referenced Jan 5, 2024

Fixes #2882. TabView: 'Frame.DrawFrame(Rect, bool)' is obsolete: 'This method is obsolete in v2. Use use LineCanvas or Frame #2980

Merged

Simplify LayoutStyle - Make it a computed/read-only property ensure correctness #3127

Closed

tig closed this Jan 8, 2024

tig added a commit to tig/Terminal.Gui that referenced this pull request Jan 8, 2024

Merges in gui-cs#3019 changes. Makes OnResizeNeeded non-virtual. If w…

a6092ae

…e find a use-case where someone wants to override it we can change this back.

tig mentioned this pull request Jan 8, 2024

Fixes #3127 - View Layout improvements - Redefines how LayoutStyle works. Fixes AutoSize etc... #3130

Merged

23 tasks

BDisp commented Jan 8, 2024

View reviewed changes

BDisp deleted the v2_textdirection-vertical-autosize_3017 branch April 15, 2024 14:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false. #3019

Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false. #3019

BDisp commented Nov 29, 2023 •

edited

Loading

BDisp commented Jan 5, 2024

tig commented Jan 5, 2024

BDisp commented Jan 5, 2024 •

edited

Loading

BDisp commented Jan 5, 2024

tig commented Jan 8, 2024

tig commented Jan 8, 2024

BDisp Jan 8, 2024

tig Jan 8, 2024

BDisp Jan 8, 2024

Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false. #3019

Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false. #3019

Conversation

BDisp commented Nov 29, 2023 • edited Loading

Pull Request checklist:

BDisp commented Jan 5, 2024

tig commented Jan 5, 2024

BDisp commented Jan 5, 2024 • edited Loading

BDisp commented Jan 5, 2024

tig commented Jan 8, 2024

tig commented Jan 8, 2024

BDisp Jan 8, 2024

Choose a reason for hiding this comment

tig Jan 8, 2024

Choose a reason for hiding this comment

BDisp Jan 8, 2024

Choose a reason for hiding this comment

BDisp commented Nov 29, 2023 •

edited

Loading

BDisp commented Jan 5, 2024 •

edited

Loading