Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding scrolling to TextGrid and a new Append method too #5434

Merged
merged 10 commits into from
Jan 24, 2025
Merged

Adding scrolling to TextGrid and a new Append method too #5434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e6b6241
Add scrolling to TextGrid at an API level.
andydotxyz Jan 18, 2025
48e6c7c
Migrate the text grid to a row based layout
andydotxyz Jan 18, 2025
00d2e9a
Cache and re-use lines in the TextGrid widget for speed when scrolling
andydotxyz Jan 19, 2025
f75367f
And add an `Append` function that can be used to show off the speed n…
andydotxyz Jan 19, 2025
e388189
Remove unused and unnecessary canvas reference caching
andydotxyz Jan 19, 2025
b7550ce
Remove unneeded position variable
andydotxyz Jan 19, 2025
f7c8c86
Merge branch 'develop' into feature/scrolltextgrid
andydotxyz Jan 19, 2025
c2b348f
Merge branch 'develop' into feature/scrolltextgrid
andydotxyz Jan 20, 2025
e063118
Corrections and clarifications
andydotxyz Jan 23, 2025
61ca852
Updating missed test file change
andydotxyz Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions widget/testdata/textgrid/basic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<canvas size="72x32">
<content>
<widget size="72x32" type="*widget.TextGrid">
<widget size="72x32" type="*widget.textGridContent">
<widget size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0">S</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">o</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">m</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">e</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">t</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">h</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">i</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">n</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">g</text>
<line size="0x0"/>
</widget>
<widget pos="0,16" size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0">E</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">l</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">s</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">e</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
</widget>
<widget pos="0,32" size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
</widget>
</widget>
</widget>
</content>
</canvas>
105 changes: 105 additions & 0 deletions widget/testdata/textgrid/scroll.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<canvas size="50x32">
<content>
<widget size="50x32" type="*widget.TextGrid">
<widget size="50x32" type="*widget.Scroll">
<widget size="72x32" type="*widget.textGridContent">
<widget size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0">S</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">o</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">m</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">e</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">t</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">h</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">i</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">n</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">g</text>
<line size="0x0"/>
</widget>
<widget pos="0,16" size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0">E</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">l</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">s</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0">e</text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
</widget>
<widget pos="0,32" size="72x16" type="*widget.textGridRow">
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
<rectangle size="0x0"/>
<text monospace size="0x0"> </text>
<line size="0x0"/>
</widget>
</widget>
<widget pos="50,0" size="0x32" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x32"/>
</widget>
<widget pos="0,26" size="50x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="34x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" radius="3" size="34x3"/>
</widget>
</widget>
</widget>
</widget>
</content>
</canvas>
Loading
Loading