-
Notifications
You must be signed in to change notification settings - Fork 59
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.
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
add LimitedWidthEntry widget #33
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
package widget | ||
|
||
import ( | ||
"strings" | ||
|
||
"fyne.io/fyne/v2" | ||
"fyne.io/fyne/v2/theme" | ||
"fyne.io/fyne/v2/widget" | ||
) | ||
|
||
// LimitedWidthEntry is an extended entry that sets a minimum width, and | ||
// limits the entry/pasting to a given number of characters `CharsWide` | ||
type LimitedWidthEntry struct { | ||
widget.Entry | ||
CharsWide int | ||
} | ||
|
||
// NewLimitedWidthEntry returns an extended entry that has a minimum width and is limited | ||
// to a CharsWide number of characters | ||
func NewLimitedWidthEntry() *LimitedWidthEntry { | ||
entry := &LimitedWidthEntry{} | ||
entry.ExtendBaseWidget(entry) | ||
return entry | ||
} | ||
|
||
// MinSize returns the size that this widget should not shrink below. | ||
// | ||
// Implements: fyne.Widget | ||
func (e *LimitedWidthEntry) MinSize() fyne.Size { | ||
min := e.Entry.MinSize() | ||
if e.CharsWide > 0 { | ||
width := fyne.MeasureText(strings.Repeat("W", e.CharsWide), theme.TextSize(), e.TextStyle).Width | ||
if e.Validator != nil { | ||
width += theme.IconInlineSize() + theme.Padding() | ||
} | ||
if min.Width < width { | ||
min.Width = width | ||
} | ||
} | ||
return min | ||
} | ||
|
||
// TypedRune is called when this item receives a char event. | ||
// | ||
// Implements: fyne.Focusable | ||
func (e *LimitedWidthEntry) TypedRune(r rune) { | ||
if e.CharsWide < 1 || len(e.Text) < e.CharsWide { | ||
e.Entry.TypedRune(r) | ||
return | ||
} | ||
} | ||
|
||
// TypedShortcut handles the registered shortcuts. | ||
// | ||
// Implements: fyne.Shortcutable | ||
func (e *LimitedWidthEntry) TypedShortcut(shortcut fyne.Shortcut) { | ||
e.Entry.TypedShortcut(shortcut) | ||
if e.CharsWide > 0 { | ||
// Limit the text length after the paste as the paste might | ||
// have inserted or appended to existing content | ||
if len(e.Text) > e.CharsWide { | ||
e.SetText(e.Text[:e.CharsWide]) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package widget | ||
|
||
import ( | ||
"testing" | ||
|
||
"fyne.io/fyne/v2" | ||
"fyne.io/fyne/v2/test" | ||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
// Check typed chars are limited | ||
func TestLimitedWidthEntry_TypedRune(t *testing.T) { | ||
entry := NewLimitedWidthEntry() | ||
|
||
win := test.NewWindow(entry) | ||
win.Resize(fyne.NewSize(200, 100)) | ||
defer win.Close() | ||
|
||
for i := 1; i < 20; i++ { | ||
// reset the widget for `i` chars | ||
entry.CharsWide = i | ||
entry.SetText("") | ||
|
||
// Get the width before we add runes | ||
width := entry.Size().Width | ||
|
||
for j := 0; j < 30; j++ { | ||
entry.TypedRune(rune('W' + j)) | ||
assert.LessOrEqual(t, len(entry.Text), i) | ||
assert.EqualValues(t, width, entry.Size().Width) | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If moving to
rune
rather thanchars
thenlen([]rune(e.Text))
will count codepoint/glyph instead of bytes.