Propose desktop integration #48

metal3d · 2022-11-16T15:48:02Z

This is a first attempt to have a desktop integration theme.

I made more tests on Gnome than KDE, it works at least with Gnome 40 and 42. Best results with Adwaita themes (light or not).

The theme also reacts on settings changes (gsettings, using dbus).

For icons, there are many problems that can happen because rasterX package is not able to parse everything. To fix the issues, I detect the installation of Inkscape or ImageMagick and I temporarily convert problematic icons to PNG. That's very fast.

The example in cmd/desktop_demo shows some widget and file view (to see that the file/dir icons are taken from Gnome or KDE icon theme).

It "just work", but I'm of course open for suggestions

PS: I will add the documentation and screenshot in README.md later.

This now can use inkscape or convert. Also, fixed the name provided to the resource to leave Fyne knowing the correct mimetype.

Some GTK application uses "view" inside window that are actually what we get with `view_bg_color`. This can be useful to use this color mode if we have a "framed" mode of views (work in progress).

We need to find "Adwaita" in the name, not the exact string. For window decoration, it is mandatory for user to set legacy application theme in gnome tweak tools.

Jacalz

Thanks for working on this. I just had a very quick look through and noticed a few things that can be improved :)

Jacalz · 2022-11-18T17:50:43Z

theme/desktop/kde.go

+		return
+	}
+	// the fontline is in the form "fontline,size,...", so we can split it
+	fontline := strings.Split(k.fontConfig, ",")


I think you might want to use strings.SplitN here given that you only care about the two first ones

Right, done 😄

Jacalz · 2022-11-18T17:57:12Z

theme/desktopEnvironmentLinux.go

+	switch wm {
+	case "gnome", "xfce", "unity", "gnome-shell", "gnome-classic", "mate", "gnome-mate":
+		return desktop.NewGnomeTheme(-1, desktop.GnomeFlagAutoReload)
+	case "kde", "kde-plasma", "plasma":


You might want "lxqt" (if that it their exact string in this case) in there as well. I believe it is relatively widely used :)

Should be fixed 😄

The variant should be calculated by the work made at fyne-io/fyne#3414 So, we can now only get colors and icons from the applied theme in Gnome or KDE.

metal3d · 2022-11-22T08:04:23Z

Just to mention, now that fyne-io/fyne#3414 is in progress, we should not try to detect variant. At least, the way I did it earlier in this proposition.

For KDE, the theme is taken from kdeglobals, and I'm not sure that it will be used like this in future releases if they use Adwaita.

For Gnome, the theme is parsed from gjs calls, using Adwaita, the colors are OK, but the variant changes needs that the user changed legacy theme - that's not OK for me...

IMHO, later, we need to propose an Adwaita theme. That's a pity for Linux users, but the futur Fyne version changed the color scheme.

Later, when Fyne 2.2 will be outdated, we have some new colors to parse (overlay colors, and so on)

andydotxyz · 2022-11-22T16:49:19Z

If you are looking at the possible changes of a Fyne update then hold on - 2.3 is due in a week or so.

metal3d · 2022-11-23T13:39:35Z

@andydotxyz I actually changed this in my local environment, I mean that the theme change detection is now removed, but I just discovered something that will be complex to manage.

Explanation of the problem, and possible resolution:

Gnome changed so many things that this is very complicated to follow. Gnome 43 (and partially Gnome 42) is now using libAdwaita. There is a few changes of color scheme between versions, but that's not the problem.

The issue is that this PR uses gjs to read GTK (v3 or v4) theme. The "gnome Adwaita theme" is not a GTK theme...
AFAIK there is no way to detect Gnome Theme color scheme.

Gnome installs a GTK Adwaita theme to make it possible for legacy GTK applications to follow the Gnome theme. But it is not directly bound to Gnome. The change should be made manually... And, so, my current PR make Fyne applications to be managed as a "legacy GTK application".

I've got a solution that works locally:

I created an Adwaita theme (with light and dark variants, taken from the documentation)

Then, loading FromDesktop theme:

if the "gnome theme name" is an Adwaita theme, I load the Fyne theme I've made—so it is bound to the color-scheme (with changes detection from Fyne 2.3 version)
if not, so I continue to use the GTK theme, but it doesn't fit the Gnome theme. It follows the GTK theme (like all other legacy GTK apps actually...)

I also added some "options", to select what we can grab from the theme (icons, font, scaling, all)

This works great, but there are tricky things I've made.

metal3d · 2022-11-23T14:27:06Z

Oh, I think I was wrong in the way I saw it working.
Actually, Adwaita is the main and "non-interchangeable" theme of Gnome, it has two color palettes, and that's it. Gnome applications can then use CSS to adapt their interface.

Older applications, based on GTK 3 or 4, have an associated theme. Either, by default, Adwaita (light), or a theme installed by the user.

So, in fact, my idea is not a bad one.

Only, we have two solutions, and I think that's pretty much how we should look at it:

I created an Adwaita theme, we can use it directly
if we ask for FromDesktopEnvironment:
- if Gnome is in version >= 42
  - we activate the Adwaita theme (which reacts very well to the change of color palette)
  - depending on the options (flags), we take the icon theme, the scaling, the font, etc...
- otherwise:
  - I find the GTK theme activated
  - I do my own thing to adapt to the theme
  - ==> but it will not react to the change of color-scheme, it is the "legacy" mode)

andydotxyz · 2022-11-23T17:08:27Z

Actually, Adwaita is the main and "non-interchangeable" theme of Gnome, it has two color palettes, and that's it. Gnome applications can then use CSS to adapt their interface.

Yup, that was my understanding too - they ripped out theming and (only very recently) allow theme-like CSS overrides to placate some devs that need more control.

metal3d added 30 commits November 16, 2022 07:54

Initial proposition for Gnome theme

1bf0ab2

Add font detection and conversion

396f841

Make a more complete theme manager for desktop

2041d9d

Remove gnome.go, now in desktop package

f977a91

Fixes some colors and more optims

8a9b79a

Fix a lot of things...

f35b297

Reorder

8631afc

Optimize gjs script

f2a1cb7

Doc, reorder, needed defers...

ccf227e

Detect theme changes with dbus

b6c3d5c

fixed some color and add examples

76850a9

Make color selection easier to tweak

4e4d801

React on settings also

a0004f4

Improve image convertion

6817a40

This now can use inkscape or convert. Also, fixed the name provided to the resource to leave Fyne knowing the correct mimetype.

The temp file were not removed in certain cases

a60bfd7

Cleanup

af8c864

Add a demo for desktop integration

d3c2689

Add invert mode

50967b5

Some GTK application uses "view" inside window that are actually what we get with `view_bg_color`. This can be useful to use this color mode if we have a "framed" mode of views (work in progress).

Add more widgets to play

bd8aef8

Add a bit more doc

8f1ac47

Prefer alias for fyne-x

24c1991

Get theme variant from Gnome 42 interface

9dcbcdd

Adaptation to use Gnome 42

8f098e9

Make some fixes for Adwaita and Gnome >= 42

bdfeb3b

Fix Adwaita usage

3c32385

We need to find "Adwaita" in the name, not the exact string. For window decoration, it is mandatory for user to set legacy application theme in gnome tweak tools.

Make the scale factor to be applied for everything

6cba316

Add a message in the console for convertion tools

de3d6d4

USe 96x96 icon size to avoid aliasing

40626dc

Changed the inkscape command line to the newest

a11355c

Fix go.mod after rebasing

58ddbd9

metal3d added 10 commits November 16, 2022 16:41

wrong varname it's not font scale, it's scale

95c01c9

Fix tests and doc...

a5cc1f4

io.WriteFile is not working on go 1.14

a0ccede

One more time, fix tests...

51a0d61

Fix nil pointer + rename theme import

10a34c2

Restrict compilation OS

135828a

Fixed imports

e26af0a

Restrict OS on Linux at this time

759b894

Fix OS restriction

29373dc

Fix unused and not initialized variables

2696bf3

metal3d marked this pull request as draft November 18, 2022 16:25

metal3d mentioned this pull request Nov 18, 2022

Update Linux/XDG app settings to delegate theme to new fd.o color-scheme fyne-io/fyne#2657

Closed

Jacalz requested changes Nov 18, 2022

View reviewed changes

metal3d mentioned this pull request Nov 19, 2022

Detect theme variant for Gnome and KDE fyne-io/fyne#3414

Merged

3 tasks

metal3d marked this pull request as ready for review November 20, 2022 09:24

metal3d marked this pull request as draft November 20, 2022 09:24

metal3d added 5 commits November 22, 2022 08:34

Simplify the integration, see details

94b21de

The variant should be calculated by the work made at fyne-io/fyne#3414 So, we can now only get colors and icons from the applied theme in Gnome or KDE.

Cleanup, no need to get Gnome Version

1a1c34f

Forgotten to remove the flags

aafaa76

Add lxqt desktop environment

84966ca

Optimize string split

c842d67

Remove unused versionNumber

db2d88b

metal3d marked this pull request as ready for review November 22, 2022 08:07

metal3d requested a review from Jacalz November 22, 2022 08:08

metal3d marked this pull request as draft November 23, 2022 14:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Propose desktop integration #48

Propose desktop integration #48

metal3d commented Nov 16, 2022

Jacalz left a comment

Jacalz Nov 18, 2022

metal3d Nov 22, 2022

Jacalz Nov 18, 2022

metal3d Nov 22, 2022

metal3d commented Nov 22, 2022

andydotxyz commented Nov 22, 2022

metal3d commented Nov 23, 2022

metal3d commented Nov 23, 2022

andydotxyz commented Nov 23, 2022

Propose desktop integration #48

Are you sure you want to change the base?

Propose desktop integration #48

Conversation

metal3d commented Nov 16, 2022

Jacalz left a comment

Choose a reason for hiding this comment

Jacalz Nov 18, 2022

Choose a reason for hiding this comment

metal3d Nov 22, 2022

Choose a reason for hiding this comment

Jacalz Nov 18, 2022

Choose a reason for hiding this comment

metal3d Nov 22, 2022

Choose a reason for hiding this comment

metal3d commented Nov 22, 2022

andydotxyz commented Nov 22, 2022

metal3d commented Nov 23, 2022

metal3d commented Nov 23, 2022

andydotxyz commented Nov 23, 2022