Skip to content

Commit

Permalink
Merge branch 'develop' into feature/package
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Jan 8, 2019
2 parents 917ecc4 + f03fd61 commit 51554c3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ It should then look like this:
To run a showcase of the features of fyne execute the following:

cd $GOPATH/src/fyne.io/fyne/cmd/fyne_demo/
go run .
go build
./fyne_demo

And you should see something like this (after you click a few buttons):

Expand Down
2 changes: 1 addition & 1 deletion driver/gl/gl.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (c *glCanvas) newGlImageTexture(obj fyne.CanvasObject) uint32 {

width := scaleInt(c, img.Size().Width)
height := scaleInt(c, img.Size().Height)
if width == 0 || height == 0 {
if width <= 0 || height <= 0 {
return 0
}

Expand Down
4 changes: 4 additions & 0 deletions driver/gl/window.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ func findMouseObj(obj fyne.CanvasObject, x, y int) (fyne.CanvasObject, int, int)
return
}

if !walked.Visible() {
return
}

switch walked.(type) {
case fyne.ClickableObject:
found = walked
Expand Down
2 changes: 1 addition & 1 deletion widget/button.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (b *buttonRenderer) Refresh() {
b.icon = canvas.NewImageFromResource(b.button.Icon)
b.objects = append(b.objects, b.icon)
} else {
b.icon.File = b.button.Icon.CachePath()
b.icon.Resource = b.button.Icon
}
b.icon.Hidden = false
} else if b.icon != nil {
Expand Down
4 changes: 2 additions & 2 deletions widget/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func (c *checkRenderer) Refresh() {
c.label.Text = c.check.Text

if c.check.Checked {
c.icon.File = theme.CheckButtonCheckedIcon().CachePath()
c.icon.Resource = theme.CheckButtonCheckedIcon()
} else {
c.icon.File = theme.CheckButtonIcon().CachePath()
c.icon.Resource = theme.CheckButtonIcon()
}

canvas.Refresh(c.check)
Expand Down
4 changes: 2 additions & 2 deletions widget/radio.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ func (r *radioRenderer) Refresh() {
item.label.Text = option

if r.radio.Selected == option {
item.icon.File = theme.RadioButtonCheckedIcon().CachePath()
item.icon.Resource = theme.RadioButtonCheckedIcon()
} else {
item.icon.File = theme.RadioButtonIcon().CachePath()
item.icon.Resource = theme.RadioButtonIcon()
}
}

Expand Down

0 comments on commit 51554c3

Please sign in to comment.