Skip to content

Commit

Permalink
Merge branch 'release/v2.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Apr 30, 2021
2 parents a25b084 + dddf878 commit 9b5a176
Show file tree
Hide file tree
Showing 70 changed files with 1,175 additions and 762 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
labels: 'unverified'
assignees: ''

---
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,28 @@
This file lists the main changes with each version of the Fyne toolkit.
More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases).

## 2.0.3 - 30 April 2021

### Fixed

* Optimisations for TextGrid rendering
* Data binding with widget.List sometimes crash while scrolling (#2125)
* Fix compilation on FreeBSD 13
* DataLists should notify only once when change.
* Keyboard will appear on Android in disabled Entry Widget (#2139)
* Save dialog with filename for Android
* form widget can't draw hinttext of appended item. (#2028)
* Don't create empty shortcuts (#2148)
* Install directory for windows install command contains ".exe"
* Fix compilation for Linux Wayland apps
* Fix tab button layout on mobile (#2117)
* Options popup does not move if a SelectEntry widget moves with popup open
* Speed improvements to Select and SelectEntry drop down
* theme/fonts has an apache LICENSE file but it should have SIL OFL (#2193)
* Fix build requirements for target macOS platforms (#2154)
* ScrollEvent.Position and ScrollEvent.AbsolutePosition is 0,0 (#2199)


## 2.0.2 - 1 April 2021

### Changed
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://pkg.go.dev/fyne.io/fyne/v2?tab=doc" title="Go API Reference" rel="nofollow"><img src="https://img.shields.io/badge/go-documentation-blue.svg?style=flat" alt="Go API Reference"></a>
<a href="https://github.com/fyne-io/fyne/releases/tag/v2.0.2" title="2.0.2 Release" rel="nofollow"><img src="https://img.shields.io/badge/version-2.0.2-blue.svg?style=flat" alt="2.0.2 release"></a>
<a href="https://github.com/fyne-io/fyne/releases/tag/v2.0.3" title="2.0.3 Release" rel="nofollow"><img src="https://img.shields.io/badge/version-2.0.3-blue.svg?style=flat" alt="2.0.3 release"></a>
<a href='http://gophers.slack.com/messages/fyne'><img src='https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=blue' alt='Join us on Slack' /></a>
<br />
<a href="https://goreportcard.com/report/fyne.io/fyne/v2"><img src="https://goreportcard.com/badge/fyne.io/fyne/v2" alt="Code Status" /></a>
Expand Down
2 changes: 2 additions & 0 deletions cmd/fyne/commands/get.go
@@ -1,6 +1,7 @@
package commands

import (
"flag"
"fmt"
"os"
"os/exec"
Expand Down Expand Up @@ -33,6 +34,7 @@ func (g *Getter) Get(pkg string) error {

// AddFlags adds available flags to the current flags parser
func (g *Getter) AddFlags() {
flag.StringVar(&g.icon, "icon", "Icon.png", "The name of the application icon file")
}

// PrintHelp prints help for this command when used in a command-line context
Expand Down
3 changes: 2 additions & 1 deletion cmd/fyne/commands/package-windows.go
Expand Up @@ -89,6 +89,7 @@ func (p *packager) packageWindows() error {
if err != nil {
return errors.Wrap(err, "Failed to write .syso file")
}
defer os.Remove(outPath)

err = os.Remove(icoPath)
if err != nil {
Expand All @@ -106,7 +107,7 @@ func (p *packager) packageWindows() error {
}

if p.install {
err := runAsAdminWindows("copy", "\"\""+p.exe+"\"\"", "\"\""+filepath.Join(os.Getenv("ProgramFiles"), p.name)+"\"\"")
err := runAsAdminWindows("copy", "\"\""+p.exe+"\"\"", "\"\""+filepath.Join(p.dir, p.name)+"\"\"")
if err != nil {
return errors.Wrap(err, "Failed to run as administrator")
}
Expand Down
11 changes: 9 additions & 2 deletions cmd/fyne/commands/package.go
Expand Up @@ -4,6 +4,7 @@ import (
"flag"
"fmt"
"log"
"runtime"
"strconv"
"strings"

Expand Down Expand Up @@ -42,7 +43,7 @@ func NewPackager() Command {

func (p *packager) AddFlags() {
flag.StringVar(&p.os, "os", "", "The operating system to target (android, android/arm, android/arm64, android/amd64, android/386, darwin, freebsd, ios, linux, netbsd, openbsd, windows)")
flag.StringVar(&p.exe, "executable", "", "The path to the executable, default is the current dir main binary")
flag.StringVar(&p.exe, "executable", "", "Specify an existing binary instead of building before package")
flag.StringVar(&p.srcDir, "sourceDir", "", "The directory to package, if executable is not set")
flag.StringVar(&p.name, "name", "", "The name of the application, default is the executable file name")
flag.StringVar(&p.icon, "icon", "Icon.png", "The name of the application icon file")
Expand Down Expand Up @@ -106,7 +107,9 @@ func (p *packager) doPackage() error {
if !util.Exists(p.exe) {
return fmt.Errorf("unable to build directory to expected executable, %s", p.exe)
}
defer p.removeBuild()
if runtime.GOOS != "windows" {
defer p.removeBuild()
}
}

switch p.os {
Expand Down Expand Up @@ -154,6 +157,10 @@ func (p *packager) validate() error {

if p.exe == "" {
p.exe = filepath.Join(p.srcDir, exeName)

if util.Exists(p.exe) { // the exe was not specified, assume stale
p.removeBuild()
}
} else if p.os == "ios" || p.os == "android" {
_, _ = fmt.Fprint(os.Stderr, "Parameter -executable is ignored for mobile builds.\n")
}
Expand Down
3 changes: 3 additions & 0 deletions cmd/fyne/commands/release.go
Expand Up @@ -311,6 +311,9 @@ func (r *releaser) validate() error {
if r.certificate == "" {
r.certificate = "3rd Party Mac Developer Application"
}
if r.profile == "" {
return errors.New("missing required -profile parameter for macOS release")
}
if r.category == "" {
return errors.New("missing required -category parameter for macOS release")
} else if !isValidMacOSCategory(r.category) {
Expand Down

0 comments on commit 9b5a176

Please sign in to comment.