fixes pixel ration on macos #458

pchampio · 2020-06-02T09:28:54Z

No description provided.

etx

Working on MacOS 10.15.5! Thanks!

pchampio · 2020-07-07T13:44:05Z

On linux (and in my setup), this method of handling the pixel ratio works better than the current one.
I have xrandr configured likeso: xrandr --output "$external" --scale 1.6x1.6 --mode 2560x1440

GeertJohan · 2020-07-07T14:05:41Z

On linux/X11 the fix/contentscale branch is broken. Everything is way too large.

It is the same value for both of my monitors now; 2.6458333.
On the master branch I have a pixelRatio of 1.595812 for the primary monitor (which then displays properly), and 0.682625 for the secondary monitor (which displays the app too small)

I don't think we can ever use glfw's content scale directly as flutters pixelRatio because flutter bases it's pixelRatio on the 160dpi standard. It's related to the Android Display Pixel calculations.

So at the very least there needs to be some formula calculating from one to the other.

pchampio · 2020-07-07T14:16:38Z

I don't think we can ever use glfw's content scale directly as flutters pixelRatio because flutter bases it's pixelRatio on the 160dpi standard. It's related to the Android Display Pixel calculations.

The current implementations of the DPI calculations is done by querying the window.GetFramebufferSize and Monitor.GetPhysicalSize this doesn't take into account users configured DPI option. In my setup (above screen), I have everything set to 203DPI which window.GetContentScale() does properly query (= 2.114 in golang)

pchampio · 2020-07-07T14:23:32Z

The --scale 1.6x1.6 trick is only a X11 workaround for not having the per monitor DPI scaling option. 😢 (Other OS might have it and correctly report the window.GetContentScale)
So if you are basing your conclusion on a workaround, (that don't imply to other people on the same OS or other OS), we might be missing something.

pchampio · 2020-07-07T14:26:36Z

Looking at the code in https://github.com/flutter/engine/blob/175a92b467e988649d642193e864189f88430524/shell/platform/glfw/flutter_glfw.cc
The GLFW impl match ours.
Still, I thinks we might be missing something.

GeertJohan · 2020-07-07T14:36:01Z

I think the two maybe should be combined or something like that...

Aurora12 · 2020-08-11T10:12:15Z

Hey guys! What's the status of this fix?

We are using this branch for MacOS builds because otherwise, it's all too small on retina displays. Is there any new info on this so this could get merged?

Aurora12 · 2020-08-12T18:35:59Z

We needed this fix for retina displays and it seemed to work just fine for all platforms... Apart from the fact that it crashed on some Macs before we got it merged with the current master head!

We tested it in laptops and iMacs running OSX 10.15.6, 10.15.5, 10.12.6 and 10.13.6 and found no stable pattern in where it worked and where it didn't. When we merged with the head of master it stopped crashing for everybody.

This is what the system log had to say about the crash:

default 16:32:16.257822 +0200 kernel process worldr[1114] caught waking the CPU 45002 times over ~43 seconds, averaging 1045 wakes / second and violating a limit of 45000 wakes over 300 seconds.
default 16:32:16.258014 +0200 symptomsd Received CPU wakes trigger:
  worldr[1114] () woke the CPU 45002 times over 43.04 seconds (average 1045/sec), violating a CPU wakes limit of 45000 over 300 seconds.

At first, we blamed the scaling callback for not debouncing as the position callback does. But after we merged the master in everything works fine with or without debouncing. We were not able to get to the bottom of the problem.

etx · 2020-08-13T17:00:14Z

We had to switch off go-flutter due to this so I stopped looking into it. We're using the native desktop embedder and calling Go from a shared library now.

JanezStupar · 2020-10-19T17:44:47Z

Any progress on this?

pchampio · 2020-10-20T09:07:57Z

@JanezStupar does hover run -b '@fix/contentscale' works ?

JanezStupar · 2020-10-20T09:40:27Z

@JanezStupar does hover run -b '@fix/contentscale' works ?

Looks great on Macos - both retina and external display.
Looks great on Linux - both built in and external display.
Looks acceptable on Windows - I don't have two different DPI displays available for that one. But the fonts seem a bit jagged. But is likely due to other causes.

pchampio · 2020-10-20T10:30:49Z

Looks great on Macos - both retina and external display.
Looks great on Linux - both built in and external display.
Looks acceptable on Windows - I don't have two different DPI displays available for that one. But the fonts seem a bit jagged. But is likely due to other causes.

Awesome, does hover run looks good on Linux ?

JanezStupar · 2020-10-20T11:47:40Z

Awesome, does hover run looks good on Linux ?

With hover 0.43.0 yes. With hover 0.44.0 no as it throws a sefgault during build (I haven't looked into it, I just downgraded hoping that somebody else is on it already.

pchampio · 2020-10-20T12:07:56Z

If you update hover.
GO111MODULE=on go get -u -a github.com/go-flutter-desktop/hover does this fix this other issue (are you able to run go-flutter 0.44.0)

provokateurin · 2020-10-20T12:10:24Z

The segfault maybe happens, because an old engine is used and not the new AOT engines. Doing a flutter clean and rm -rf ~/.cache/hover/engine (linux) should fix that

JanezStupar · 2020-10-20T12:34:41Z

I tried all your suggestions the result is the same. I have created a new ticket for that as to not clutter this discussion.

JanezStupar · 2020-10-21T11:41:36Z

So what is the recomendation for my issue? To use the @fix/contentscale until it gets merged?

pchampio · 2020-10-21T12:21:13Z

@JanezStupar yes, I'll get this merge for MacOS and Windows this week.

pchampio · 2020-11-01T21:29:44Z

@GeertJohan I've compiled all cases and came out with this code. Is it good for you ?

This work for me on linux.
with:
and xrandr --output "$external" --scale 1.6x1.6 --mode 2560x1440

pchampio · 2020-11-01T21:33:11Z

fixes #84
fixes #461

pchampio · 2020-11-23T15:19:27Z

@GeertJohan Can you look at this.
This should fix macos scaling issue: #461 (comment)

GeertJohan · 2021-01-22T13:45:00Z

I tried to use this branch locally with the latest version of hover, but the resulting release binary failed instantly:

~/s/g/i/d/g/b/o/linux-release :master ✱
$ ./invition-dashboard
[ERROR:flutter/runtime/dart_vm_data.cc(18)] VM snapshot invalid and could not be inferred from settings.
[ERROR:flutter/runtime/dart_vm.cc(250)] Could not setup VM data to bootstrap the VM from.
[ERROR:flutter/runtime/dart_vm_lifecycle.cc(84)] Could not create Dart VM instance.
[FATAL:flutter/shell/common/shell.cc(264)] Check failed: vm. Must be able to initialize the VM.
SIGABRT: abort
PC=0x7f8c98a8d18b m=0 sigcode=18446744073709551610
signal arrived during cgo execution

goroutine 1 [syscall, locked to thread]:
runtime.cgocall(0x606110, 0xc0001498d8, 0xc0001360e0)
	/home/geertjohan/go/src/runtime/cgocall.go:133 +0x5b fp=0xc0001498a8 sp=0xc000149870 pc=0x42947b
github.com/go-flutter-desktop/go-flutter/embedder._Cfunc_runFlutter(0xc00001c1e0, 0xc000122140, 0xc0001360e0, 0x0)
	_cgo_gotypes.go:737 +0x4d fp=0xc0001498d8 sp=0xc0001498a8 pc=0x5667ed
github.com/go-flutter-desktop/go-flutter/embedder.(*FlutterEngine).Run.func5(0xc00001c1e0, 0xc000122140, 0xc0001360e0, 0x6e)
	/home/geertjohan/src/github.com/go-flutter-desktop/go-flutter/embedder/embedder.go:150 +0xd0 fp=0xc000149908 sp=0xc0001498d8 pc=0x568bf0
github.com/go-flutter-desktop/go-flutter/embedder.(*FlutterEngine).Run(0xc000122140, 0xc00001c1e0, 0xc00007e2d0, 0x3, 0x3, 0x0, 0x0)
	/home/geertjohan/src/github.com/go-flutter-desktop/go-flutter/embedder/embedder.go:150 +0x337 fp=0xc000149b48 sp=0xc000149908 pc=0x5674f7
github.com/go-flutter-desktop/go-flutter.(*Application).Run(0xc000136000, 0x0, 0x0)
	/home/geertjohan/src/github.com/go-flutter-desktop/go-flutter/application.go:250 +0x985 fp=0xc000149ec0 sp=0xc000149b48 pc=0x58b6c5
github.com/go-flutter-desktop/go-flutter.Run(0xc000072080, 0x7, 0x8, 0xc00005ff68, 0x2)
	/home/geertjohan/src/github.com/go-flutter-desktop/go-flutter/application.go:26 +0x4d fp=0xc000149ef0 sp=0xc000149ec0 pc=0x58a38d
main.main()
	/home/geertjohan/src/gitlab.com/invition/dashboard/go/cmd/main.go:24 +0x17d fp=0xc000149f88 sp=0xc000149ef0 pc=0x5ee6fd
runtime.main()
	/home/geertjohan/go/src/runtime/proc.go:204 +0x209 fp=0xc000149fe0 sp=0xc000149f88 pc=0x45d829
runtime.goexit()
	/home/geertjohan/go/src/runtime/asm_amd64.s:1374 +0x1 fp=0xc000149fe8 sp=0xc000149fe0 pc=0x48ed81

rax    0x0
rbx    0x7f8c98905b80
rcx    0x7f8c98a8d18b
rdx    0x0
rdi    0x2
rsi    0x7ffdc92453e0
rbp    0xa
rsp    0x7ffdc92453e0
r8     0x0
r9     0x7ffdc92453e0
r10    0x8
r11    0x246
r12    0x7ffdc9246bd0
r13    0x7ffdc92464a8
r14    0x7ffdc9245da8
r15    0x7ffdc9246470
rip    0x7f8c98a8d18b
rflags 0x246
cs     0x33
fs     0x0
gs     0x0

pchampio · 2021-01-22T14:20:38Z

What I can tell is that the following error:

[ERROR:flutter/runtime/dart_vm_data.cc(18)] VM snapshot invalid and could not be inferred from settings.
[ERROR:flutter/runtime/dart_vm.cc(250)] Could not setup VM data to bootstrap the VM from.
[ERROR:flutter/runtime/dart_vm_lifecycle.cc(84)] Could not create Dart VM instance.
[FATAL:flutter/shell/common/shell.cc(264)] Check failed: vm. Must be able to initialize the VM.

is a building error. ~~And isn't related to this PR.~~ (the diff wasn't complete on github)

(with the latest version of hover, the -b flags need to be used with: go env -w GOPROXY=direct)

pchampio · 2021-01-22T15:07:41Z

I think a rebase is needed!

diff --git a/accessibility.go b/accessibility.go
index 386e943..97a280f 100644
--- a/accessibility.go
+++ b/accessibility.go
@@ -9,7 +9,7 @@ var defaultAccessibilityPlugin = &accessibilityPlugin{}
 
 func (p *accessibilityPlugin) InitPlugin(messenger plugin.BinaryMessenger) error {
 	channel := plugin.NewBasicMessageChannel(messenger, "flutter/accessibility", plugin.StandardMessageCodec{})
-	// Ignored: go-flutter doesn't support accessibility events
+	// Ignored: go-flutter dosn't support accessibility events
 	channel.HandleFunc(func(_ interface{}) (interface{}, error) { return nil, nil })
 	return nil
 }
diff --git a/application.go b/application.go
index 14422e7..6e1a684 100644
--- a/application.go
+++ b/application.go
@@ -320,6 +320,9 @@ func (a *Application) Run() error {
 			})
 		})
 	})
+	a.window.SetContentScaleCallback(func(window *glfw.Window, x float32, y float32) {
+		windowManager.glfwRefreshCallback(window)
+	})
 
 	// Attach glfw window callbacks for text input
 	a.window.SetKeyCallback(
diff --git a/embedder/build.go b/embedder/build.go
index eef0dcd..9f185b0 100644
--- a/embedder/build.go
+++ b/embedder/build.go
@@ -1,5 +1,3 @@
-// +build !no_engine_tags
-
 package embedder
 
 // #cgo linux LDFLAGS: -lflutter_engine -Wl,-rpath,$ORIGIN
diff --git a/embedder/embedder.go b/embedder/embedder.go
index 81cf529..2aa94a6 100644
--- a/embedder/embedder.go
+++ b/embedder/embedder.go
@@ -132,17 +132,17 @@ func (flu *FlutterEngine) Run(userData unsafe.Pointer, vmArgs []string) error {
 	}
 
 	if C.FlutterEngineRunsAOTCompiledDartCode() {
-		elfSnapshotPath := C.CString(flu.ElfSnapshotPath)
-		defer C.free(unsafe.Pointer(elfSnapshotPath))
+		// elfSnapshotPath := C.CString(flu.ElfSnapshotPath)
+		// defer C.free(unsafe.Pointer(elfSnapshotPath))
 
-		dataIn := C.FlutterEngineAOTDataSource{}
+		// dataIn := C.FlutterEngineAOTDataSource{}
 
-		C.createAOTDataSource(&dataIn, elfSnapshotPath)
-		res := (Result)(C.FlutterEngineCreateAOTData(&dataIn, &flu.aotDataSource))
-		if res != ResultSuccess {
-			return res.GoError("C.FlutterEngineCreateAOTData()")
-		}
-		args.aot_data = flu.aotDataSource
+		// C.createAOTDataSource(&dataIn, elfSnapshotPath)
+		// res := (Result)(C.FlutterEngineCreateAOTData(&dataIn, &flu.aotDataSource))
+		// if res != ResultSuccess {
+		// return res.GoError("C.FlutterEngineCreateAOTData()")
+		// }
+		// args.aot_data = flu.aotDataSource
 	}
 
 	args.struct_size = C.size_t(unsafe.Sizeof(args))
@@ -167,10 +167,10 @@ func (flu *FlutterEngine) Shutdown() error {
 	}
 
 	if C.FlutterEngineRunsAOTCompiledDartCode() {
-		res := (Result)(C.FlutterEngineCollectAOTData(flu.aotDataSource))
-		if res != ResultSuccess {
-			return res.GoError("engine.Shutdown()")
-		}
+		// res := (Result)(C.FlutterEngineCollectAOTData(flu.aotDataSource))
+		// if res != ResultSuccess {
+		// return res.GoError("engine.Shutdown()")
+		// }
 	}
 	return nil
 }

pchampio · 2021-01-22T15:18:48Z

Fixed:
(and also tested in release mode)

pchampio · 2021-01-24T17:53:16Z

fixes: #563

xkeyC · 2021-02-18T10:10:27Z

When will it be merged? After testing the fix/contentscale branch solved my problem.

pchampio · 2022-06-30T20:01:00Z

After many report from the community, this branch fixes the problem for the majority of the users.

I'll merge this branch as a step in the right direction but not a complete solution. (IMHO, it's good enough of linux windows and macos users)

pchampio requested a review from GeertJohan June 2, 2020 09:31

etx reviewed Jun 2, 2020

View reviewed changes

etx mentioned this pull request Jun 3, 2020

pixelRatio wrong on built in MacOS display #461

Closed

edTheGuy00 mentioned this pull request Oct 29, 2020

Enlarged and blurry texts on Release and Release-Debug builds #528

Closed

pchampio linked an issue Nov 1, 2020 that may be closed by this pull request

pixelRatio wrong on built in MacOS display #461

Closed

pchampio added 4 commits January 22, 2021 16:08

fixes pixel ration on macos

5de0dea

Update glfw.go

91bdb4c

Update glfw.go

b0ef2e9

Update glfw.go

17ae550

pchampio force-pushed the fix/contentscale branch from d585248 to 17ae550 Compare January 22, 2021 15:14

This was linked to issues Jan 24, 2021

[Windows] Changing DPI Scaling does not scale app #563

Closed

Wrong PixelRatio calculation (based on DPI scaling) #84

Closed

pchampio mentioned this pull request May 23, 2022

[MacOS] display has a problem with the scaled MacOS monitor #654

Closed

tidy

4980f6c

Merge branch 'master' into fix/contentscale

db52c42

pchampio merged commit 729801f into master Jun 30, 2022

pchampio deleted the fix/contentscale branch June 30, 2022 20:04

provokateurin mentioned this pull request Jul 14, 2022

Render problem in linux #665

Closed

fixes pixel ration on macos #458

fixes pixel ration on macos #458

Uh oh!

Conversation

pchampio commented Jun 2, 2020

Uh oh!

etx left a comment

Choose a reason for hiding this comment

Uh oh!

pchampio commented Jul 7, 2020

Uh oh!

GeertJohan commented Jul 7, 2020

Uh oh!

pchampio commented Jul 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Jul 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Jul 7, 2020

Uh oh!

GeertJohan commented Jul 7, 2020

Uh oh!

Aurora12 commented Aug 11, 2020

Uh oh!

Aurora12 commented Aug 12, 2020

Uh oh!

etx commented Aug 13, 2020

Uh oh!

JanezStupar commented Oct 19, 2020

Uh oh!

pchampio commented Oct 20, 2020

Uh oh!

JanezStupar commented Oct 20, 2020

Uh oh!

pchampio commented Oct 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JanezStupar commented Oct 20, 2020

Uh oh!

pchampio commented Oct 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

provokateurin commented Oct 20, 2020

Uh oh!

JanezStupar commented Oct 20, 2020

Uh oh!

JanezStupar commented Oct 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Oct 21, 2020

Uh oh!

pchampio commented Nov 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Nov 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Nov 23, 2020

Uh oh!

GeertJohan commented Jan 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Jan 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Jan 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pchampio commented Jan 22, 2021

Uh oh!

pchampio commented Jan 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xkeyC commented Feb 18, 2021

Uh oh!

pchampio commented Jun 30, 2022

Uh oh!

Uh oh!

pchampio commented Jul 7, 2020 •

edited

Loading

pchampio commented Jul 7, 2020 •

edited

Loading

pchampio commented Oct 20, 2020 •

edited

Loading

pchampio commented Oct 20, 2020 •

edited

Loading

JanezStupar commented Oct 21, 2020 •

edited

Loading

pchampio commented Nov 1, 2020 •

edited

Loading

pchampio commented Nov 1, 2020 •

edited

Loading

GeertJohan commented Jan 22, 2021 •

edited

Loading

pchampio commented Jan 22, 2021 •

edited

Loading

pchampio commented Jan 22, 2021 •

edited

Loading

pchampio commented Jan 24, 2021 •

edited

Loading