Compare commits

..

No commits in common. "9dc929f5453251975e411785e648e800949ec97b" and "74fd3fdd558f1bacb003787d35da355a32a613a5" have entirely different histories.

2 changed files with 7 additions and 13 deletions

View File

@ -36,15 +36,9 @@ func (this *containerBox) SetColor (c color.Color) {
this.invalidateTransparentChildren() this.invalidateTransparentChildren()
} }
func (this *containerBox) SetTextureTile (texture canvas.Texture) { func (this *containerBox) SetTexture (texture canvas.Texture) {
if this.texture == texture { return } if this.texture == texture { return }
this.box.SetTextureTile(texture) this.box.SetTexture(texture)
this.invalidateTransparentChildren()
}
func (this *containerBox) SetTextureCenter (texture canvas.Texture) {
if this.texture == texture { return }
this.box.SetTextureTile(texture)
this.invalidateTransparentChildren() this.invalidateTransparentChildren()
} }

View File

@ -267,10 +267,10 @@ func (window *window) Paste (callback func (data.Data, error), accept ...data.Mi
} }
func (window *window) SetVisible (visible bool) { func (window *window) SetVisible (visible bool) {
if window.visible == visible { return } if this.visible == visible { return }
window.visible = visible window.visible = visible
if window.visible { if this.visible {
window.xWindow.Map() window.xWindow.Map()
if window.shy { window.grabInput() } if window.shy { window.grabInput() }
} else { } else {
@ -280,7 +280,7 @@ func (window *window) SetVisible (visible bool) {
} }
func (window *window) Visible () bool { func (window *window) Visible () bool {
return window.visible return this.visible
} }
func (window *window) Close () { func (window *window) Close () {
@ -293,7 +293,7 @@ func (window *window) Close () {
// we are a modal dialog, so unlock the parent // we are a modal dialog, so unlock the parent
window.modalParent.hasModal = false window.modalParent.hasModal = false
} }
window.SetVisible(false) window.Hide()
window.SetRoot(nil) window.SetRoot(nil)
delete(window.backend.windows, window.xWindow.Id) delete(window.backend.windows, window.xWindow.Id)
window.xWindow.Destroy() window.xWindow.Destroy()
@ -377,7 +377,7 @@ func (window *window) pushRegion (region image.Rectangle) {
return return
} }
subCanvas := window.xCanvas.SubCanvas(region) subCanvas := window.xCanvas.Clip(region)
if subCanvas == nil { if subCanvas == nil {
return return
} }