brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port extensions app and portal to GTK4

Browse Source 
With the previous preparations in place, it is time to take the plunge.

As both the app and the portal use the same small library for handling
external windows, port everything at once to avoid the hassle of building
and installing two versions of the library.

With the portal using GTK4 now, all extensions must port their preference
widgets as well.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1495>
This commit is contained in:
Florian Müllner 2020-04-15 20:27:15 +02:00 committed by Marge Bot
parent ba039bcce5
commit edd34c50d9
13 changed files with 249 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/dbusServices/extensions/extensionsService.js
View File

@ -128,7 +128,7 @@ var ExtensionsService = class extends ServiceImplementation {
externalWindow = Shew.ExternalWindow.new_from_handle(parentWindow); externalWindow = Shew.ExternalWindow.new_from_handle(parentWindow);
if (externalWindow) if (externalWindow)
externalWindow.set_parent_of(window.window); externalWindow.set_parent_of(window.get_surface());
if (options.modal) if (options.modal)
window.modal = options.modal.get_boolean(); window.modal = options.modal.get_boolean();
@ -177,11 +177,11 @@ var ExtensionPrefsDialog = GObject.registerClass({
this._initActions(); this._initActions();
this._addCustomStylesheet(); this._addCustomStylesheet();
this._gesture = new Gtk.GestureMultiPress({ this._gesture = new Gtk.GestureClick({
widget: this._expander,
button: 0, button: 0,
exclusive: true, exclusive: true,
}); });
this._expander.add_controller(this._gesture);
this._gesture.connect('released', (gesture, nPress) => { this._gesture.connect('released', (gesture, nPress) => {
if (nPress === 1) if (nPress === 1)
@ -216,9 +216,9 @@ var ExtensionPrefsDialog = GObject.registerClass({
_syncExpandedStyle() { _syncExpandedStyle() {
if (this._revealer.reveal_child) if (this._revealer.reveal_child)
this._expander.get_style_context().add_class('expanded'); this._expander.add_css_class('expanded');
else if (!this._revealer.child_revealed) else if (!this._revealer.child_revealed)
this._expander.get_style_context().remove_class('expanded'); this._expander.remove_css_class('expanded');
} }
_setError(exc) { _setError(exc) {
@ -276,7 +276,7 @@ var ExtensionPrefsDialog = GObject.registerClass({
} catch (e) { } catch (e) {
logError(e, 'Failed to add application style'); logError(e, 'Failed to add application style');
} }
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(),
provider, provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
} }

6
js/dbusServices/extensions/main.js
View File

@ -1,7 +1,7 @@
/* exported main */ /* exported main */
imports.gi.versions.Gdk = '3.0'; imports.gi.versions.Gdk = '4.0';
imports.gi.versions.Gtk = '3.0'; imports.gi.versions.Gtk = '4.0';
const { Gtk } = imports.gi; const { Gtk } = imports.gi;
const pkg = imports.package; const pkg = imports.package;
@ -10,7 +10,7 @@ const { DBusService } = imports.dbusService;
const { ExtensionsService } = imports.extensionsService; const { ExtensionsService } = imports.extensionsService;
function main() { function main() {
Gtk.init(null); Gtk.init();
pkg.initFormat(); pkg.initFormat();
const service = new DBusService( const service = new DBusService(

41
js/dbusServices/extensions/ui/extension-prefs-dialog.ui
View File

@ -1,31 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="ExtensionPrefsDialog" parent="GtkWindow"> <template class="ExtensionPrefsDialog" parent="GtkWindow">
<property name="default-width">600</property> <property name="default-width">600</property>
<property name="default-height">400</property> <property name="default-height">400</property>
<child type="titlebar"> <child type="titlebar">
<object class="GtkHeaderBar" id="headerBar"> <object class="GtkHeaderBar"/>
<property name="visible">True</property>
<property name="show-close-button">True</property>
</object>
</child> </child>
<child> <child>
<object class="GtkStack" id="stack"> <object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="hscrollbar-policy">never</property> <property name="hscrollbar-policy">never</property>
<property name="propagate-natural-height">True</property> <property name="propagate-natural-height">True</property>
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<property name="visible">True</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="margin-start">100</property> <property name="margin-start">100</property>
<property name="margin-end">100</property> <property name="margin-end">100</property>
@ -34,7 +25,6 @@
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Something’s gone wrong</property> <property name="label" translatable="yes">Something’s gone wrong</property>
<attributes> <attributes>
<attribute name="scale" value="1.44"/> <!-- x-large --> <attribute name="scale" value="1.44"/> <!-- x-large -->
@ -46,7 +36,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors.</property> <property name="label" translatable="yes">We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors.</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -54,29 +43,24 @@
</child> </child>
<child> <child>
<object class="GtkFrame"> <object class="GtkFrame">
<property name="visible">True</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="expander"> <object class="GtkBox" id="expander">
<property name="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<style> <style>
<class name="expander"/> <class name="expander"/>
</style> </style>
<child> <child>
<object class="GtkImage" id="expanderArrow"> <object class="GtkImage" id="expanderArrow">
<property name="visible">True</property>
<property name="icon-name">pan-end-symbolic</property> <property name="icon-name">pan-end-symbolic</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Technical Details</property> <property name="label" translatable="yes">Technical Details</property>
</object> </object>
</child> </child>
@ -84,15 +68,11 @@
</child> </child>
<child> <child>
<object class="GtkRevealer" id="revealer"> <object class="GtkRevealer" id="revealer">
<property name="visible">True</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkTextView" id="errorView"> <object class="GtkTextView" id="errorView">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="monospace">True</property> <property name="monospace">True</property>
<property name="editable">False</property> <property name="editable">False</property>
<property name="wrap-mode">word</property> <property name="wrap-mode">word</property>
@ -104,28 +84,17 @@
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<style> <style>
<class name="expander-toolbar"/> <class name="expander-toolbar"/>
</style> </style>
<child> <child>
<object class="GtkButton"> <object class="GtkButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="action-name">win.copy-error</property> <property name="action-name">win.copy-error</property>
<style> <property name="has-frame">False</property>
<class name="flat"/>
<class name="image-button"/>
</style>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">edit-copy-symbolic</property> <property name="icon-name">edit-copy-symbolic</property>
</object> </object>
</child> </child>
</object>
</child>
<child> <child>
<object class="GtkButton" id="homeButton"> <object class="GtkButton" id="homeButton">
<property name="visible" <property name="visible"
@ -136,13 +105,9 @@
<property name="halign">end</property> <property name="halign">end</property>
<property name="label" translatable="yes">Homepage</property> <property name="label" translatable="yes">Homepage</property>
<property name="tooltip-text" translatable="yes">Visit extension homepage</property> <property name="tooltip-text" translatable="yes">Visit extension homepage</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="no-show-all">True</property> <property name="has-frame">False</property>
<property name="action-name">win.show-url</property> <property name="action-name">win.show-url</property>
<style>
<class name="flat"/>
</style>
</object> </object>
</child> </child>
</object> </object>

133
subprojects/extensions-app/data/ui/extension-row.ui
View File

@ -1,26 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="ExtensionRow" parent="GtkListBoxRow"> <template class="ExtensionRow" parent="GtkListBoxRow">
<property name="visible">True</property>
<property name="activatable">False</property> <property name="activatable">False</property>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property>
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<property name="column-spacing">12</property> <property name="column-spacing">12</property>
<child> <child>
<object class="GtkLabel" id="nameLabel"> <object class="GtkLabel" id="nameLabel"/>
<property name="visible">True</property>
</object>
</child> </child>
<child> <child>
<object class="GtkImage" id="errorIcon"> <object class="GtkImage" id="errorIcon">
<property name="no-show-all">True</property> <property name="visible">False</property>
<property name="icon-name">dialog-error-symbolic</property> <property name="icon-name">dialog-error-symbolic</property>
<style> <style>
<class name="error"/> <class name="error"/>
@ -29,7 +24,7 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="updatesIcon"> <object class="GtkImage" id="updatesIcon">
<property name="no-show-all">True</property> <property name="visible">False</property>
<property name="icon-name">software-update-available-symbolic</property> <property name="icon-name">software-update-available-symbolic</property>
<style> <style>
<class name="warning"/> <class name="warning"/>
@ -38,77 +33,53 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="prefsButton"> <object class="GtkButton" id="prefsButton">
<property name="no-show-all">True</property>
<property name="visible" <property name="visible"
bind-source="prefsButton" bind-source="prefsButton"
bind-property="sensitive" bind-property="sensitive"
bind-flags="sync-create"/> bind-flags="sync-create"/>
<property name="can-focus">True</property> <property name="icon-name">emblem-system-symbolic</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="action-name">row.show-prefs</property> <property name="action-name">row.show-prefs</property>
<style> <style>
<class name="circular"/> <class name="circular"/>
<class name="image-button"/>
</style> </style>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">emblem-system-symbolic</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSwitch" id="switch"> <object class="GtkSwitch" id="switch">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="action-name">row.enabled</property> <property name="action-name">row.enabled</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator"> <object class="GtkSeparator"/>
<property name="visible">True</property>
</object>
</child> </child>
<child> <child>
<object class="GtkButton" id="revealButton"> <object class="GtkButton" id="revealButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="has-frame">False</property>
<property name="icon-name">pan-end-symbolic</property>
<style> <style>
<class name="details-button"/> <class name="details-button"/>
<class name="image-button"/>
<class name="flat"/>
</style> </style>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">pan-end-symbolic</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkRevealer" id="revealer"> <object class="GtkRevealer" id="revealer">
<property name="visible">True</property>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="row-spacing">6</property> <property name="row-spacing">6</property>
<property name="column-spacing">12</property> <property name="column-spacing">12</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Description</property> <property name="label" translatable="yes">Description</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<style> <style>
@ -118,7 +89,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="descriptionLabel"> <object class="GtkLabel" id="descriptionLabel">
<property name="visible">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="max-width-chars">60</property> <property name="max-width-chars">60</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -131,27 +101,26 @@
bind-source="versionLabel" bind-source="versionLabel"
bind-property="visible" bind-property="visible"
bind-flags="sync-create"/> bind-flags="sync-create"/>
<property name="no-show-all">True</property>
<property name="label" translatable="yes">Version</property> <property name="label" translatable="yes">Version</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<style> <style>
<class name="dim-label"/> <class name="dim-label"/>
</style> </style>
<layout>
<property name="column">0</property>
<property name="row">1</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="versionLabel"> <object class="GtkLabel" id="versionLabel">
<property name="no-show-all">True</property> <property name="visible">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<layout>
<property name="column">1</property>
<property name="row">1</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
@ -159,27 +128,26 @@
bind-source="authorLabel" bind-source="authorLabel"
bind-property="visible" bind-property="visible"
bind-flags="sync-create"/> bind-flags="sync-create"/>
<property name="no-show-all">True</property>
<property name="label" translatable="yes">Author</property> <property name="label" translatable="yes">Author</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<style> <style>
<class name="dim-label"/> <class name="dim-label"/>
</style> </style>
<layout>
<property name="column">0</property>
<property name="row">2</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="authorLabel"> <object class="GtkLabel" id="authorLabel">
<property name="no-show-all">True</property> <property name="visible">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<layout>
<property name="column">1</property>
<property name="row">2</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
@ -187,44 +155,42 @@
bind-source="errorLabel" bind-source="errorLabel"
bind-property="visible" bind-property="visible"
bind-flags="sync-create"/> bind-flags="sync-create"/>
<property name="no-show-all">True</property>
<property name="label" translatable="yes">Error</property> <property name="label" translatable="yes">Error</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property> <property name="yalign">0</property>
<style> <style>
<class name="dim-label"/> <class name="dim-label"/>
</style> </style>
<layout>
<property name="column">0</property>
<property name="row">3</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="errorLabel"> <object class="GtkLabel" id="errorLabel">
<property name="no-show-all">True</property> <property name="visible">False</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="max-width-chars">60</property> <property name="max-width-chars">60</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<layout>
<property name="column">1</property>
<property name="row">3</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton">
<property name="visible">True</property>
<property name="label" translatable="yes">Website</property> <property name="label" translatable="yes">Website</property>
<property name="action-name">row.show-url</property> <property name="action-name">row.show-url</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<layout>
<property name="column">0</property>
<property name="row">4</property>
</layout>
</object> </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="removeButton"> <object class="GtkButton" id="removeButton">
@ -232,7 +198,6 @@
bind-source="removeButton" bind-source="removeButton"
bind-property="sensitive" bind-property="sensitive"
bind-flags="sync-create"/> bind-flags="sync-create"/>
<property name="no-show-all">True</property>
<property name="label" translatable="yes">Remove…</property> <property name="label" translatable="yes">Remove…</property>
<property name="action-name">row.uninstall</property> <property name="action-name">row.uninstall</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -241,20 +206,20 @@
<style> <style>
<class name="destructive-action"/> <class name="destructive-action"/>
</style> </style>
</object> <layout>
<packing> <property name="column">1</property>
<property name="left-attach">1</property> <property name="row">4</property>
<property name="top-attach">4</property> </layout>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
<packing> </child>
<property name="left-attach">0</property> <layout>
<property name="top-attach">1</property> <property name="column">0</property>
<property name="width">8</property> <property name="row">1</property>
</packing> <property name="column-span">8</property>
</layout>
</object>
</child> </child>
</object> </object>
</child> </child>

115
subprojects/extensions-app/data/ui/extensions-window.ui
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<menu id="primary-menu"> <menu id="primary-menu">
@ -17,7 +16,6 @@
<object class="GtkPopover" id="infoPopover"> <object class="GtkPopover" id="infoPopover">
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="margin-end">12</property> <property name="margin-end">12</property>
@ -26,7 +24,6 @@
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">To find and add extensions, visit &lt;a href="https://extensions.gnome.org"&gt;extensions.gnome.org&lt;/a&gt;.</property> <property name="label" translatable="yes">To find and add extensions, visit &lt;a href="https://extensions.gnome.org"&gt;extensions.gnome.org&lt;/a&gt;.</property>
<property name="use-markup">True</property> <property name="use-markup">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -34,7 +31,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Warning</property> <property name="label" translatable="yes">Warning</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
@ -45,7 +41,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Extensions can cause system issues, including performance problems. If you encounter problems with your system, it is recommended to disable all extensions.</property> <property name="label" translatable="yes">Extensions can cause system issues, including performance problems. If you encounter problems with your system, it is recommended to disable all extensions.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="max-width-chars">40</property> <property name="max-width-chars">40</property>
@ -61,79 +56,62 @@
<property name="title" translatable="yes">Extensions</property> <property name="title" translatable="yes">Extensions</property>
<child type="titlebar"> <child type="titlebar">
<object class="GtkHeaderBar"> <object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="show-close-button">True</property>
<child> <child>
<object class="GtkMenuButton"> <object class="GtkMenuButton">
<property name="visible">True</property>
<property name="popover">infoPopover</property> <property name="popover">infoPopover</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">dialog-information-symbolic</property> <property name="icon-name">dialog-information-symbolic</property>
</object> </object>
</child> </child>
</object> <child type="end">
</child>
<child>
<object class="GtkMenuButton" id="menuButton"> <object class="GtkMenuButton" id="menuButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="menu-model">primary-menu</property> <property name="menu-model">primary-menu</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">open-menu-symbolic</property> <property name="icon-name">open-menu-symbolic</property>
</object> </object>
</child> </child>
</object> <child type="end">
<packing>
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="searchButton"> <object class="GtkToggleButton" id="searchButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">edit-find-symbolic</property> <property name="icon-name">edit-find-symbolic</property>
<child>
<object class="GtkShortcutController">
<property name='scope'>global</property>
<child>
<object class='GtkShortcut'>
<property name='trigger'>&lt;Control&gt;f</property>
<property name='action'>activate</property>
</object> </object>
</child> </child>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
<child> <child>
<object class='GtkShortcut'>
<property name='trigger'>&lt;Control&gt;s</property>
<property name='action'>activate</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child type="end">
<object class="GtkSwitch"> <object class="GtkSwitch">
<property name="visible">True</property>
<property name="action-name">win.user-extensions-enabled</property> <property name="action-name">win.user-extensions-enabled</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkSearchBar" id="searchBar"> <object class="GtkSearchBar" id="searchBar">
<property name="visible">True</property> <property name="key-capture-widget">ExtensionsWindow</property>
<property name="search-mode-enabled" <property name="search-mode-enabled"
bind-source="searchButton" bind-source="searchButton"
bind-property="active" bind-property="active"
bind-flags="bidirectional"/> bind-flags="bidirectional"/>
<child> <child>
<object class="GtkSearchEntry" id="searchEntry"> <object class="GtkSearchEntry" id="searchEntry">
<property name="visible">True</property>
<property name="max-width-chars">35</property> <property name="max-width-chars">35</property>
</object> </object>
</child> </child>
@ -141,19 +119,19 @@
</child> </child>
<child> <child>
<object class="GtkStack" id="mainStack"> <object class="GtkStack" id="mainStack">
<property name="visible">True</property>
<property name="transition-type">crossfade</property> <property name="transition-type">crossfade</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child> <child>
<object class="GtkStackPage">
<property name="name">main</property>
<property name="child">
<object class="GtkScrolledWindow" id="scrolledWindow"> <object class="GtkScrolledWindow" id="scrolledWindow">
<property name="visible">True</property>
<property name="hscrollbar-policy">never</property> <property name="hscrollbar-policy">never</property>
<child> <child>
<object class="GtkViewport"> <object class="GtkViewport">
<property name="visible">True</property> <property name="scroll-to-focus">True</property>
<child> <child>
<object class="GtkBox" id="mainBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="margin-start">36</property> <property name="margin-start">36</property>
@ -177,8 +155,8 @@
</child> </child>
<child> <child>
<object class="GtkListBox" id="userList"> <object class="GtkListBox" id="userList">
<property name="visible">True</property>
<property name="selection-mode">none</property> <property name="selection-mode">none</property>
<property name="show-separators">True</property>
<property name="margin-bottom">24</property> <property name="margin-bottom">24</property>
<style> <style>
<class name="frame"/> <class name="frame"/>
@ -201,8 +179,8 @@
</child> </child>
<child> <child>
<object class="GtkListBox" id="systemList"> <object class="GtkListBox" id="systemList">
<property name="visible">True</property>
<property name="selection-mode">none</property> <property name="selection-mode">none</property>
<property name="show-separators">True</property>
<style> <style>
<class name="frame"/> <class name="frame"/>
</style> </style>
@ -213,13 +191,14 @@
</object> </object>
</child> </child>
</object> </object>
<packing> </property>
<property name="name">main</property> </object>
</packing>
</child> </child>
<child> <child>
<object class="GtkStackPage">
<property name="name">placeholder</property>
<property name="child">
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="margin-start">32</property> <property name="margin-start">32</property>
<property name="margin-end">32</property> <property name="margin-end">32</property>
@ -229,14 +208,12 @@
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property>
<property name="pixel-size">96</property> <property name="pixel-size">96</property>
<property name="icon-name">org.gnome.Extensions-symbolic</property> <property name="icon-name">org.gnome.Extensions-symbolic</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">No Installed Extensions</property> <property name="label" translatable="yes">No Installed Extensions</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -245,13 +222,14 @@
</object> </object>
</child> </child>
</object> </object>
<packing> </property>
<property name="name">placeholder</property> </object>
</packing>
</child> </child>
<child> <child>
<object class="GtkStackPage">
<property name="name">noshell</property>
<property name="child">
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="margin-start">100</property> <property name="margin-start">100</property>
<property name="margin-end">100</property> <property name="margin-end">100</property>
<property name="margin-top">100</property> <property name="margin-top">100</property>
@ -260,7 +238,6 @@
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Something’s gone wrong</property> <property name="label" translatable="yes">Something’s gone wrong</property>
<attributes> <attributes>
<attribute name="scale" value="1.44"/> <attribute name="scale" value="1.44"/>
@ -272,7 +249,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again.</property> <property name="label" translatable="yes">We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again.</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -282,18 +258,16 @@
</object> </object>
</child> </child>
</object> </object>
<packing> </property>
<property name="name">noshell</property> </object>
</packing>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkActionBar" id="updatesBar"> <object class="GtkActionBar" id="updatesBar">
<property name="no-show-all">True</property> <property name="revealed">False</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property>
<property name="pixel-size">24</property> <property name="pixel-size">24</property>
<property name="margin-start">6</property> <property name="margin-start">6</property>
<property name="margin-end">6</property> <property name="margin-end">6</property>
@ -307,11 +281,9 @@
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="label" translatable="yes">Extension Updates Ready</property> <property name="label" translatable="yes">Extension Updates Ready</property>
<attributes> <attributes>
@ -321,16 +293,14 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="updatesLabel"> <object class="GtkLabel" id="updatesLabel">
<property name="visible">True</property>
<property name="halign">start</property> <property name="halign">start</property>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child> <child type="end">
<object class="GtkButton"> <object class="GtkButton">
<property name="label" translatable="yes">Log Out…</property> <property name="label" translatable="yes">Log Out…</property>
<property name="visible">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="action-name">win.logout</property> <property name="action-name">win.logout</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
@ -338,9 +308,6 @@
<class name="suggested-action"/> <class name="suggested-action"/>
</style> </style>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

56
subprojects/extensions-app/js/main.js
View File

@ -1,6 +1,6 @@
/* exported main */ /* exported main */
imports.gi.versions.Gdk = '3.0'; imports.gi.versions.Gdk = '4.0';
imports.gi.versions.Gtk = '3.0'; imports.gi.versions.Gtk = '4.0';
const Gettext = imports.gettext; const Gettext = imports.gettext;
const Package = imports.package; const Package = imports.package;
@ -65,7 +65,7 @@ class Application extends Gtk.Application {
} catch (e) { } catch (e) {
logError(e, 'Failed to add application style'); logError(e, 'Failed to add application style');
} }
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(),
provider, provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
@ -88,7 +88,6 @@ var ExtensionsWindow = GObject.registerClass({
InternalChildren: [ InternalChildren: [
'userList', 'userList',
'systemList', 'systemList',
'mainBox',
'mainStack', 'mainStack',
'scrolledWindow', 'scrolledWindow',
'searchBar', 'searchBar',
@ -106,8 +105,6 @@ var ExtensionsWindow = GObject.registerClass({
this._exporter = new Shew.WindowExporter({ window: this }); this._exporter = new Shew.WindowExporter({ window: this });
this._exportedHandle = ''; this._exportedHandle = '';
this._mainBox.set_focus_vadjustment(this._scrolledWindow.vadjustment);
let action; let action;
action = new Gio.SimpleAction({ name: 'show-about' }); action = new Gio.SimpleAction({ name: 'show-about' });
action.connect('activate', this._showAbout.bind(this)); action.connect('activate', this._showAbout.bind(this));
@ -127,16 +124,6 @@ var ExtensionsWindow = GObject.registerClass({
}); });
this.add_action(action); this.add_action(action);
const accelGroup = new Gtk.AccelGroup();
this._searchButton.add_accelerator('clicked',
accelGroup, Gdk.KEY_f, Gdk.ModifierType.CONTROL_MASK, 0);
this._searchButton.add_accelerator('clicked',
accelGroup, Gdk.KEY_s, Gdk.ModifierType.CONTROL_MASK, 0);
this.add_accel_group(accelGroup);
this.connect('key-press-event',
(w, event) => this._searchBar.handle_event(event));
this._searchTerms = []; this._searchTerms = [];
this._searchEntry.connect('search-changed', () => { this._searchEntry.connect('search-changed', () => {
const { text } = this._searchEntry; const { text } = this._searchEntry;
@ -150,7 +137,6 @@ var ExtensionsWindow = GObject.registerClass({
}); });
this._userList.set_sort_func(this._sortList.bind(this)); this._userList.set_sort_func(this._sortList.bind(this));
this._userList.set_header_func(this._updateHeader.bind(this));
this._userList.set_filter_func(this._filterList.bind(this)); this._userList.set_filter_func(this._filterList.bind(this));
this._userList.set_placeholder(new Gtk.Label({ this._userList.set_placeholder(new Gtk.Label({
label: _('No Matches'), label: _('No Matches'),
@ -158,11 +144,9 @@ var ExtensionsWindow = GObject.registerClass({
margin_end: 12, margin_end: 12,
margin_top: 12, margin_top: 12,
margin_bottom: 12, margin_bottom: 12,
visible: true,
})); }));
this._systemList.set_sort_func(this._sortList.bind(this)); this._systemList.set_sort_func(this._sortList.bind(this));
this._systemList.set_header_func(this._updateHeader.bind(this));
this._systemList.set_filter_func(this._filterList.bind(this)); this._systemList.set_filter_func(this._filterList.bind(this));
this._systemList.set_placeholder(new Gtk.Label({ this._systemList.set_placeholder(new Gtk.Label({
label: _('No Matches'), label: _('No Matches'),
@ -170,7 +154,6 @@ var ExtensionsWindow = GObject.registerClass({
margin_end: 12, margin_end: 12,
margin_top: 12, margin_top: 12,
margin_bottom: 12, margin_bottom: 12,
visible: true,
})); }));
this._shellProxy.connectSignal('ExtensionStateChanged', this._shellProxy.connectSignal('ExtensionStateChanged',
@ -265,18 +248,10 @@ var ExtensionsWindow = GObject.registerClass({
t => row.keywords.some(k => k.startsWith(t))); t => row.keywords.some(k => k.startsWith(t)));
} }
_updateHeader(row, before) {
if (!before || row.get_header())
return;
let sep = new Gtk.Separator({ orientation: Gtk.Orientation.HORIZONTAL });
row.set_header(sep);
}
_findExtensionRow(uuid) { _findExtensionRow(uuid) {
return [ return [
...this._userList.get_children(), ...this._userList,
...this._systemList.get_children(), ...this._systemList,
].find(c => c.uuid === uuid); ].find(c => c.uuid === uuid);
} }
@ -296,13 +271,13 @@ var ExtensionsWindow = GObject.registerClass({
// and reset the variable to null so that we create a new row // and reset the variable to null so that we create a new row
// below and add it to the appropriate list // below and add it to the appropriate list
if (row && row.type !== extension.type) { if (row && row.type !== extension.type) {
row.destroy(); row.get_parent().remove(row);
row = null; row = null;
} }
if (row) { if (row) {
if (extension.state === ExtensionState.UNINSTALLED) if (extension.state === ExtensionState.UNINSTALLED)
row.destroy(); row.get_parent().remove(row);
} else { } else {
this._addExtensionRow(extension); this._addExtensionRow(extension);
} }
@ -332,12 +307,11 @@ var ExtensionsWindow = GObject.registerClass({
_addExtensionRow(extension) { _addExtensionRow(extension) {
let row = new ExtensionRow(extension); let row = new ExtensionRow(extension);
row.show_all();
if (row.type === ExtensionType.PER_USER) if (row.type === ExtensionType.PER_USER)
this._userList.add(row); this._userList.append(row);
else else
this._systemList.add(row); this._systemList.append(row);
} }
_queueUpdatesCheck() { _queueUpdatesCheck() {
@ -354,8 +328,8 @@ var ExtensionsWindow = GObject.registerClass({
} }
_syncListVisibility() { _syncListVisibility() {
this._userList.visible = this._userList.get_children().length > 0; this._userList.visible = [...this._userList].length > 1;
this._systemList.visible = this._systemList.get_children().length > 0; this._systemList.visible = [...this._systemList].length > 1;
if (this._userList.visible || this._systemList.visible) if (this._userList.visible || this._systemList.visible)
this._mainStack.visible_child_name = 'main'; this._mainStack.visible_child_name = 'main';
@ -364,13 +338,13 @@ var ExtensionsWindow = GObject.registerClass({
} }
_checkUpdates() { _checkUpdates() {
let nUpdates = this._userList.get_children().filter(c => c.hasUpdate).length; let nUpdates = [...this._userList].filter(c => c.hasUpdate).length;
this._updatesLabel.label = Gettext.ngettext( this._updatesLabel.label = Gettext.ngettext(
'%d extension will be updated on next login.', '%d extension will be updated on next login.',
'%d extensions will be updated on next login.', '%d extensions will be updated on next login.',
nUpdates).format(nUpdates); nUpdates).format(nUpdates);
this._updatesBar.visible = nUpdates > 0; this._updatesBar.revealed = nUpdates > 0;
} }
_extensionsLoaded() { _extensionsLoaded() {
@ -412,7 +386,7 @@ var ExtensionRow = GObject.registerClass({
name: 'show-prefs', name: 'show-prefs',
enabled: this.hasPrefs, enabled: this.hasPrefs,
}); });
action.connect('activate', () => this.get_toplevel().openPrefs(this.uuid)); action.connect('activate', () => this.get_root().openPrefs(this.uuid));
this._actionGroup.add_action(action); this._actionGroup.add_action(action);
action = new Gio.SimpleAction({ action = new Gio.SimpleAction({
@ -429,7 +403,7 @@ var ExtensionRow = GObject.registerClass({
name: 'uninstall', name: 'uninstall',
enabled: this.type === ExtensionType.PER_USER, enabled: this.type === ExtensionType.PER_USER,
}); });
action.connect('activate', () => this.get_toplevel().uninstall(this.uuid)); action.connect('activate', () => this.get_root().uninstall(this.uuid));
this._actionGroup.add_action(action); this._actionGroup.add_action(action);
action = new Gio.SimpleAction({ action = new Gio.SimpleAction({

2
subprojects/shew/meson.build
View File

@ -22,7 +22,7 @@ pkglibdir = join_paths(get_option('libdir'), package_name)
girdir = join_paths(pkgdatadir, 'gir-1.0') girdir = join_paths(pkgdatadir, 'gir-1.0')
typelibdir = join_paths(pkglibdir, 'girepository-1.0') typelibdir = join_paths(pkglibdir, 'girepository-1.0')
gtk_dep = dependency('gtk+-3.0') gtk_dep = dependency('gtk4')
x11_dep = dependency('x11', required: false) x11_dep = dependency('x11', required: false)
subdir('src') subdir('src')

2
subprojects/shew/src/meson.build
View File

@ -21,7 +21,7 @@ libshew_gir = gnome.generate_gir(libshew,
sources: shew_sources + shew_public_headers, sources: shew_sources + shew_public_headers,
nsversion: api_version, nsversion: api_version,
namespace: 'Shew', namespace: 'Shew',
includes: ['Gdk-3.0', 'Gtk-3.0'], includes: ['Gdk-4.0', 'Gtk-4.0'],
extra_args: ['--quiet'], extra_args: ['--quiet'],
install_dir_gir: girdir, install_dir_gir: girdir,
install_dir_typelib: typelibdir, install_dir_typelib: typelibdir,

6
subprojects/shew/src/shew-external-window-wayland.c
View File

@ -21,7 +21,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#endif #endif
#include "shew-external-window-wayland.h" #include "shew-external-window-wayland.h"
@ -77,14 +77,14 @@ shew_external_window_wayland_new (const char *handle_str)
static void static void
shew_external_window_wayland_set_parent_of (ShewExternalWindow *external_window, shew_external_window_wayland_set_parent_of (ShewExternalWindow *external_window,
GdkWindow *child_window) GdkSurface *child_surface)
{ {
ShewExternalWindowWayland *external_window_wayland = ShewExternalWindowWayland *external_window_wayland =
SHEW_EXTERNAL_WINDOW_WAYLAND (external_window); SHEW_EXTERNAL_WINDOW_WAYLAND (external_window);
char *handle_str = external_window_wayland->handle_str; char *handle_str = external_window_wayland->handle_str;
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
if (!gdk_wayland_window_set_transient_for_exported (child_window, handle_str)) if (!gdk_wayland_toplevel_set_transient_for_exported (GDK_WAYLAND_TOPLEVEL (child_surface), handle_str))
g_warning ("Failed to set portal window transient for external parent"); g_warning ("Failed to set portal window transient for external parent");
#endif #endif
} }

8
subprojects/shew/src/shew-external-window-x11.c
View File

@ -21,7 +21,7 @@
#include <errno.h> #include <errno.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/x11/gdkx.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -110,14 +110,14 @@ shew_external_window_x11_new (const char *handle_str)
static void static void
shew_external_window_x11_set_parent_of (ShewExternalWindow *external_window, shew_external_window_x11_set_parent_of (ShewExternalWindow *external_window,
GdkWindow *child_window) GdkSurface *child_surface)
{ {
ShewExternalWindowX11 *external_window_x11 = ShewExternalWindowX11 *external_window_x11 =
SHEW_EXTERNAL_WINDOW_X11 (external_window); SHEW_EXTERNAL_WINDOW_X11 (external_window);
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
XSetTransientForHint (GDK_WINDOW_XDISPLAY (child_window), XSetTransientForHint (GDK_SURFACE_XDISPLAY (child_surface),
GDK_WINDOW_XID (child_window), GDK_SURFACE_XID (child_surface),
external_window_x11->foreign_xid); external_window_x11->foreign_xid);
#endif #endif
} }

4
subprojects/shew/src/shew-external-window.c
View File

@ -75,10 +75,10 @@ shew_external_window_new_from_handle (const char *handle_str)
void void
shew_external_window_set_parent_of (ShewExternalWindow *external_window, shew_external_window_set_parent_of (ShewExternalWindow *external_window,
GdkWindow *child_window) GdkSurface *child_surface)
{ {
SHEW_EXTERNAL_WINDOW_GET_CLASS (external_window)->set_parent_of (external_window, SHEW_EXTERNAL_WINDOW_GET_CLASS (external_window)->set_parent_of (external_window,
child_window); child_surface);
} }
/** /**

4
subprojects/shew/src/shew-external-window.h
View File

@ -32,12 +32,12 @@ struct _ShewExternalWindowClass
GObjectClass parent_class; GObjectClass parent_class;
void (*set_parent_of) (ShewExternalWindow *external_window, void (*set_parent_of) (ShewExternalWindow *external_window,
GdkWindow *child_window); GdkSurface *child_surface);
}; };
ShewExternalWindow *shew_external_window_new_from_handle (const char *handle_str); ShewExternalWindow *shew_external_window_new_from_handle (const char *handle_str);
void shew_external_window_set_parent_of (ShewExternalWindow *external_window, void shew_external_window_set_parent_of (ShewExternalWindow *external_window,
GdkWindow *child_window); GdkSurface *child_surface);
GdkDisplay *shew_external_window_get_display (ShewExternalWindow *external_window); GdkDisplay *shew_external_window_get_display (ShewExternalWindow *external_window);

19
subprojects/shew/src/shew-window-exporter.c
View File

@ -21,10 +21,10 @@
#include "shew-window-exporter.h" #include "shew-window-exporter.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/x11/gdkx.h>
#endif #endif
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#endif #endif
struct _ShewWindowExporter struct _ShewWindowExporter
@ -53,7 +53,7 @@ shew_window_exporter_new (GtkWindow *window)
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
static void static void
wayland_window_exported (GdkWindow *window, wayland_window_exported (GdkToplevel *toplevel,
const char *handle, const char *handle,
gpointer user_data) gpointer user_data)
{ {
@ -90,8 +90,8 @@ shew_window_exporter_export (ShewWindowExporter *exporter,
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))) if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)))
{ {
GdkWindow *w = gtk_widget_get_window (widget); GdkSurface *s = gtk_native_get_surface (GTK_NATIVE (widget));
guint32 xid = (guint32) gdk_x11_window_get_xid (w); guint32 xid = (guint32) gdk_x11_surface_get_xid (s);
g_task_return_pointer (task, g_strdup_printf ("x11:%x", xid), g_free); g_task_return_pointer (task, g_strdup_printf ("x11:%x", xid), g_free);
} }
@ -100,8 +100,9 @@ shew_window_exporter_export (ShewWindowExporter *exporter,
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (widget))) if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (widget)))
{ {
GdkWindow *w = gtk_widget_get_window (widget); GdkSurface *s = gtk_native_get_surface (GTK_NATIVE (widget));
gdk_wayland_window_export_handle (w, wayland_window_exported, gdk_wayland_toplevel_export_handle (GDK_WAYLAND_TOPLEVEL (s),
wayland_window_exported,
g_steal_pointer (&task), NULL); g_steal_pointer (&task), NULL);
} }
#endif #endif
@ -136,8 +137,8 @@ shew_window_exporter_unexport (ShewWindowExporter *exporter)
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (widget))) if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (widget)))
{ {
GdkWindow *w = gtk_widget_get_window (widget); GdkSurface *s = gtk_native_get_surface (GTK_NATIVE (widget));
gdk_wayland_window_unexport_handle (w); gdk_wayland_toplevel_unexport_handle (GDK_WAYLAND_TOPLEVEL (s));
} }
#endif #endif
} }