Tabs support #1836
Tabs support #1836
Conversation
| // TextStyle represents the styles that can be applied to a text canvas object | ||
| // or text based widget. | ||
| type TextStyle struct { | ||
| Bold bool // Should text be bold | ||
| Italic bool // Should text be italic | ||
| Monospace bool // Use the system monospace font instead of regular | ||
| tabWidth int // Width of tabs in spaces |
There was a problem hiding this comment.
Can't we just used a public field like the other items? the check for 0 can be done inside the text code instead?
There was a problem hiding this comment.
I don't think this is done. The default code below is what causes the exposed public API above - if we just use a public field as suggested then the default handling would be in painter / widget and would avoid the additional API requirements.
| @@ -30,12 +30,33 @@ const ( | |||
| TextWrapWord | |||
| ) | |||
|
|
|||
| const ( | |||
| // DefaultTabWidth is the default width in spaces | |||
There was a problem hiding this comment.
API introduced needs a since header:
//
// Since: 2.1
However - I don't think this API is necessary. If the defaulting was handled in the renderer and widget packages we could hide it in an internal package until we decide if this detail should be exposed...
| // TextStyle represents the styles that can be applied to a text canvas object | ||
| // or text based widget. | ||
| type TextStyle struct { | ||
| Bold bool // Should text be bold | ||
| Italic bool // Should text be italic | ||
| Monospace bool // Use the system monospace font instead of regular | ||
| tabWidth int // Width of tabs in spaces |
There was a problem hiding this comment.
I don't think this is done. The default code below is what causes the exposed public API above - if we just use a public field as suggested then the default handling would be in painter / widget and would avoid the additional API requirements.
| // TabWidth either returns the set tab width or if not set the returns the DefaultTabWidth | ||
| func (ts *TextStyle) TabWidth() int { | ||
| if ts.tabWidth == 0 { | ||
| return DefaultTabWidth |
There was a problem hiding this comment.
Neither this nor the setter are required if the field is public
|
Hey @Jacalz would you be OK if I landed this and made the changes I requested, or did you have additional requests? |
|
Go ahead. It's fine for me 🙂 |
|
Thanks so much for all your work on this @adrianre12, I have now landed it with the changes requested above. |
Description:
This PR adds tab support to Entry and Label via the text Canvas. It is done by replacing font.Drawer with painter.Drawer. painter.
Drawer embeds font.Drawer and implements custom DrawString() and MeasureString() that handle the tab rune.
When a tab rune is encountered the draw dot is advanced to the next tab position. The tab positions are whole multiples of
tabWidth * spaceWidthwhere tab width is in characters and the space width is in dots.The tab width is set in the theme and defaults to 4. The space width is found from the width of the current fonts space glyph.
I have reverted the tab approximations done in #761
Fixes #1791
Monospaced=true
MonoSpaced=false
Checklist:
Where applicable: