Skip to content

Commit

Permalink
Merge branch 'master' into release/v2.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Mar 17, 2022
2 parents 771f964 + 7595a4b commit c8fbd52
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ contact_links:
- name: Ask a question
url: https://fyne.io/support/
about: For a toolkit question or help with your code go to our support page

blank_issues_enabled: false
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ Fixes #(issue)
- [ ] Public APIs match existing style.
- [ ] Any breaking changes have a deprecation path or have been discussed.
- [ ] Updated the vendor folder (using `go mod vendor`).
- [ ] Check for binary size increases when importing new modules.
4 changes: 2 additions & 2 deletions .github/workflows/platform_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.14.x, 1.17.x]
go-version: [1.14, 1.17]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down Expand Up @@ -38,4 +38,4 @@ jobs:
GOROOT: ${{steps.setup-go-faster.outputs.GOROOT}}
with:
path-to-profile: coverage.out
if: ${{ runner.os == 'Linux' && github.event_name == 'push' }}
if: ${{ runner.os == 'Linux' && matrix.go-version == '1.17' && github.event_name == 'push' }}
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ More detailed release notes can be found on the [releases page](https://github.c

## 2.1.4 - 17 March 2022

* SetTheme() behaves is not fully effective for widget.Form (#2810)
* SetTheme() is not fully effective for widget.Form (#2810)
* FolderOpenDialog SetDismissText is ineffective (#2830)
* window.Resize() does not work if SetFixedSize(true) is set after (#2819)
* Container.Remove() race causes crash (#2826, #2775, #2481)
Expand Down Expand Up @@ -237,7 +237,7 @@ More detailed release notes can be found on the [releases page](https://github.c
* Correct initial state of entry validation
* fix entry widget mouse drag selection when scrolled
* List widget panic when refreshing after changing content length (#1864)
* Fix image caching that was too agressive on resize
* Fix image caching that was too aggressive on resize
* Pointer and cursor misalignment in widget.Entry (#1937)
* SIGSEGV Sometimes When Closing a Program by Clicking a Button (#1604)
* Advanced Color Picker shows Black for custom primary color as RGBA (#1970)
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ There are various ways to contribute, perhaps the following helps you know how t

If you've found something wrong we want to know about it, please help us understand the problem so we can resolve it.

1. Check to see if this already is recorded, if so add some more information [issue list](/fyne-io/fyne/issues)
1. Check to see if this already is recorded, if so add some more information [issue list](https://github.com/fyne-io/fyne/issues)
2. If not then create a new issue using the [bug report template](https://github.com/fyne-io/fyne/issues/new?assignees=&labels=&template=bug_report.md&title=)
3. Stay involved in the conversation on the issue as it is triaged and progressed.

Expand All @@ -27,12 +27,12 @@ If you can follow these steps then your code should get accepted fast.
## Adding a feature

It's always good news to hear that people want to contribute functionality.
But first of all check that it fits within our [[Vision]] and if we are already considering it on our [[Roadmap]].
If you're not sure then you should join our #fyne-contributors channel on the gophers Slack server
But first of all check that it fits within our [Vision](https://github.com/fyne-io/fyne/wiki/Vision) and if we are already considering it on our [Roadmap](https://github.com/fyne-io/fyne/wiki/Roadmap).
If you're not sure then you should join our #fyne-contributors channel on the [Gophers Slack server](https://gophers.slack.com/app_redirect?channel=fyne-contributors).

Once you are ready to code then the following steps should give you a smooth process:

1. Read through the "Contributing Code" section further down this page.
1. Read through the [Contributing Code](#contributing-code) section further down this page.
2. Think about how you would structure your code and how it can be tested.
3. Write some code and enjoy the ease of writing Go code for even a complex project :).
4. Run the tests and make sure everything still works as expected using `go test ./...`.
Expand Down
2 changes: 1 addition & 1 deletion cmd/fyne/commands/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "fyne.io/fyne/v2/cmd/fyne/internal/commands"
// Command defines the required functionality to provide a subcommand to the "fyne" tool.
//
// Deprecated: Access to the internal cli commands are being removed.
// Better versions of bundler, installer, packager and releaser will be avaliable in the future.
// Better versions of bundler, installer, packager and releaser will be available in the future.
type Command interface {
AddFlags()
PrintHelp(string)
Expand Down
2 changes: 1 addition & 1 deletion cmd/fyne/internal/mobile/binres/binres_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ func compareStrings(t *testing.T, a, b []string) error {
}
if err == nil && v == "__" {
if !strings.HasPrefix(x, "4.0.") {
// as of the time of this writing, the current version of build tools being targetted
// as of the time of this writing, the current version of build tools being targeted
// reports 4.0.4-1406430. Previously, this was 4.0.3. This number is likely still due
// to change so only report error if 4.x incremented.
//
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/mobile/file_ios.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (s *secureWriteCloser) Close() error {

func existsURI(u fyne.URI) (bool, error) {
if u.Scheme() != "file" {
return true, errors.New("cannot check existance of " + u.Scheme() + " on iOS")
return true, errors.New("cannot check existence of " + u.Scheme() + " on iOS")
}

cStr := C.CString(u.Path())
Expand Down

0 comments on commit c8fbd52

Please sign in to comment.