Merge branch 'develop' into fix/2184

fyne-io · May 4, 2021 · 2acff4b · 2acff4b
2 parents 8907efe + 1c34798
commit 2acff4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/cmd/fyne/internal/commands/package.go b/cmd/fyne/internal/commands/package.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 
-	// import image encodings
+  // import image encodings
 	_ "image/jpeg"
 	_ "image/png"
 	"log"
@@ -196,7 +196,7 @@ func (p *Packager) doPackage() error {
 		if !util.Exists(p.exe) {
 			return fmt.Errorf("unable to build directory to expected executable, %s", p.exe)
 		}
-		if runtime.GOOS != "windows" {
+		if p.os != "windows" {
 			defer p.removeBuild()
 		}
 	}

diff --git a/internal/driver/glfw/animation.go b/internal/driver/glfw/animation.go
@@ -2,10 +2,10 @@ package glfw
 
 import "fyne.io/fyne/v2"
 
-func (g *gLDriver) StartAnimation(a *fyne.Animation) {
-	g.animation.Start(a)
+func (d *gLDriver) StartAnimation(a *fyne.Animation) {
+	d.animation.Start(a)
 }
 
-func (g *gLDriver) StopAnimation(a *fyne.Animation) {
-	g.animation.Stop(a)
+func (d *gLDriver) StopAnimation(a *fyne.Animation) {
+	d.animation.Stop(a)
 }
diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -1226,20 +1226,6 @@ func (w *window) focused(_ *glfw.Window, isFocused bool) {
 	}
 }
 
-func isKeyModifierPair(keyName fyne.KeyName, modifier desktop.Modifier) bool {
-	switch modifier {
-	case desktop.ShiftModifier:
-		return (keyName == desktop.KeyShiftLeft || keyName == desktop.KeyShiftRight)
-	case desktop.ControlModifier:
-		return (keyName == desktop.KeyControlLeft || keyName == desktop.KeyControlRight)
-	case desktop.AltModifier:
-		return (keyName == desktop.KeyAltLeft || keyName == desktop.KeyAltRight)
-	case desktop.SuperModifier:
-		return (keyName == desktop.KeySuperLeft || keyName == desktop.KeySuperRight)
-	}
-	return false
-}
-
 func (w *window) triggersShortcut(keyName fyne.KeyName, modifier desktop.Modifier) bool {
 	var shortcut fyne.Shortcut
 	ctrlMod := desktop.ControlModifier