Polish colored select size and rounding
This commit is contained in:
parent
0d5f814f34
commit
113cbb2da2
|
|
@ -1126,12 +1126,16 @@ func (cs *ColoredSelect) CreateRenderer() fyne.WidgetRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
bg := canvas.NewRectangle(selectBackgroundColor())
|
bg := canvas.NewRectangle(selectBackgroundColor())
|
||||||
|
bg.CornerRadius = 8
|
||||||
bar := canvas.NewRectangle(selectAccentColor(cs.selected, cs.colorMap))
|
bar := canvas.NewRectangle(selectAccentColor(cs.selected, cs.colorMap))
|
||||||
bar.SetMinSize(fyne.NewSize(6, 24))
|
bar.SetMinSize(fyne.NewSize(6, 28))
|
||||||
|
bar.CornerRadius = 8
|
||||||
|
bar.TopRightCornerRadius = 0
|
||||||
|
bar.BottomRightCornerRadius = 0
|
||||||
|
|
||||||
label := canvas.NewText(displayText, selectTextColor())
|
label := canvas.NewText(displayText, selectTextColor())
|
||||||
label.Alignment = fyne.TextAlignLeading
|
label.Alignment = fyne.TextAlignLeading
|
||||||
label.TextSize = 14
|
label.TextSize = 15
|
||||||
|
|
||||||
caret := canvas.NewText("▼", selectTextColor())
|
caret := canvas.NewText("▼", selectTextColor())
|
||||||
caret.TextSize = 12
|
caret.TextSize = 12
|
||||||
|
|
@ -1139,6 +1143,8 @@ func (cs *ColoredSelect) CreateRenderer() fyne.WidgetRenderer {
|
||||||
content := container.NewBorder(nil, nil, bar, nil,
|
content := container.NewBorder(nil, nil, bar, nil,
|
||||||
container.NewPadded(container.NewBorder(nil, nil, nil, caret, label)))
|
container.NewPadded(container.NewBorder(nil, nil, nil, caret, label)))
|
||||||
|
|
||||||
|
bg.SetMinSize(fyne.NewSize(0, 36))
|
||||||
|
|
||||||
tappable := NewTappable(container.NewMax(bg, content), func() {
|
tappable := NewTappable(container.NewMax(bg, content), func() {
|
||||||
if !cs.disabled {
|
if !cs.disabled {
|
||||||
cs.showPopup()
|
cs.showPopup()
|
||||||
|
|
@ -1287,7 +1293,7 @@ func (r *coloredSelectRenderer) Objects() []fyne.CanvasObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
func selectBackgroundColor() color.Color {
|
func selectBackgroundColor() color.Color {
|
||||||
return color.NRGBA{R: 54, G: 72, B: 96, A: 255}
|
return color.NRGBA{R: 52, G: 66, B: 86, A: 255}
|
||||||
}
|
}
|
||||||
|
|
||||||
func selectTextColor() color.Color {
|
func selectTextColor() color.Color {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user