Skip to content

Commit

Permalink
Merge pull request #5434 from andydotxyz/feature/scrolltextgrid
Browse files Browse the repository at this point in the history
Adding scrolling to TextGrid and a new Append method too
  • Loading branch information
andydotxyz authored Jan 24, 2025
2 parents 7ac3fd5 + 61ca852 commit f8dfaaa
Show file tree
Hide file tree
Showing 4 changed files with 634 additions and 174 deletions.
95 changes: 95 additions & 0 deletions widget/testdata/textgrid/basic.xml
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
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

0 comments on commit f8dfaaa

Please sign in to comment.