Skip to content

Commit 5a92e68

Browse files
authored
Merge branch 'main' into leolost/dont-make-centered-clients-docks
2 parents 617f765 + 1800c07 commit 5a92e68

29 files changed

+350
-611
lines changed

data/gala.gschema.xml

-165
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<value nick="switch-to-workspace-next" value="9" />
1414
<value nick="switch-to-workspace-last" value="10" />
1515
</enum>
16-
<enum id="GalaWindowOverviewType">
17-
<value nick='grid' value='0'/>
18-
<value nick='natural' value='1'/>
19-
</enum>
2016

2117
<schema path="/io/elementary/desktop/screensaver/" id="io.elementary.desktop.screensaver">
2218
<key type="b" name="lock-on-suspend">
@@ -40,11 +36,6 @@
4036
<summary>Action for the top left corner</summary>
4137
<description></description>
4238
</key>
43-
<key enum="GalaWindowOverviewType" name="window-overview-type">
44-
<default>'grid'</default>
45-
<summary>Algorithm for window overview layout</summary>
46-
<description>Choose the algorithm used for exposing the windows.</description>
47-
</key>
4839
<key enum="GalaActionType" name="hotcorner-topright">
4940
<default>"none"</default>
5041
<summary>Action for the top right corner</summary>
@@ -70,16 +61,6 @@
7061
followed by a ':' and then the command. ';;' is used as delimiter between command definitions.
7162
</description>
7263
</key>
73-
<key type="b" name="edge-tiling">
74-
<default>true</default>
75-
<summary>Enable edge tiling when dropping windows on screen edges</summary>
76-
<description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description>
77-
</key>
78-
<key type="b" name="use-new-notifications">
79-
<default>true</default>
80-
<summary>If new notifications should be used</summary>
81-
<description>DEPRECATED: This key is deprecated and ignored.</description>
82-
</key>
8364
<key type="s" name="panel-main-menu-action">
8465
<default>''</default>
8566
<summary>Panel main menu action</summary>
@@ -95,16 +76,6 @@
9576
<summary></summary>
9677
<description></description>
9778
</key>
98-
<key type="b" name="dynamic-workspaces">
99-
<default>true</default>
100-
<summary>Enable dynamic workspace instead of static ones</summary>
101-
<description>Use a dynamically increasing or decreasing number, as needed, of workspaces instead of a static, fixed number.</description>
102-
</key>
103-
<key type="as" name="dock-names">
104-
<default><![CDATA[['docky', 'Docky', 'plank']]]></default>
105-
<summary>Names that are recognized as dock windows for the window switcher</summary>
106-
<description>When launching the window-switcher, Gala iterates over this list and attempts to find a window matching the names. If it does, it will hide this window and fade it back in, once the the switcher is closed.</description>
107-
</key>
10879
<key type="b" name="move-maximized-workspace">
10980
<default>false</default>
11081
<summary>Automatically move maximized windows to a new workspace</summary>
@@ -155,11 +126,6 @@
155126
<default><![CDATA[['<Super>minus', '<Super>KP_Subtract']]]></default>
156127
<summary>Zoom out</summary>
157128
</key>
158-
<key type="as" name="expose-windows">
159-
<default><![CDATA[['']]]></default>
160-
<summary>DEPRECATED: This key is deprecated and ignored</summary>
161-
<description></description>
162-
</key>
163129
<key type="as" name="expose-all-windows">
164130
<default><![CDATA[['<Super>a']]]></default>
165131
<summary>Shortcut to open the window overview for all windows</summary>
@@ -218,143 +184,12 @@
218184
</key>
219185
</schema>
220186

221-
<schema path="/org/pantheon/desktop/gala/appearance/" id="org.pantheon.desktop.gala.appearance">
222-
<key type="b" name="attach-modal-dialogs">
223-
<default>false</default>
224-
<summary>Attach modal dialogs</summary>
225-
<description>When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.</description>
226-
</key>
227-
<key type="s" name="button-layout">
228-
<default>'close:maximize'</default>
229-
<summary>Arrangement of buttons on the titlebar</summary>
230-
<description>Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.</description>
231-
</key>
232-
<key type="d" name="alt-tab-window-opacity">
233-
<range min="0.0" max="1.0"/>
234-
<default>0.0</default>
235-
<summary>The opacity of windows behind the window switcher.</summary>
236-
<description>DEPRECATED: This key is deprecated and ignored.</description>
237-
</key>
238-
<key type="s" name="workspace-switcher-background">
239-
<default>''</default>
240-
<summary>DEPRECATED: This key is deprecated and ignored.</summary>
241-
</key>
242-
</schema>
243-
244187
<schema path="/org/pantheon/desktop/gala/animations/" id="org.pantheon.desktop.gala.animations">
245188
<key type="b" name="enable-animations">
246189
<default>true</default>
247190
<summary>Enable Animations</summary>
248191
<description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
249192
</key>
250-
<key type="i" name="open-duration">
251-
<default>350</default>
252-
<summary>Duration of the open animation</summary>
253-
<description>DEPRECATED: This key is deprecated and ignored.</description>
254-
</key>
255-
<key type="i" name="snap-duration">
256-
<default>250</default>
257-
<summary>Duration of the snap animation as used by maximize/unmaximize</summary>
258-
<description>DEPRECATED: This key is deprecated and ignored.</description>
259-
</key>
260-
<key type="i" name="close-duration">
261-
<default>195</default>
262-
<summary>Duration of the close animation</summary>
263-
<description>DEPRECATED: This key is deprecated and ignored.</description>
264-
</key>
265-
<key type="i" name="minimize-duration">
266-
<default>200</default>
267-
<summary>Duration of the minimize animation</summary>
268-
<description>DEPRECATED: This key is deprecated and ignored.</description>
269-
</key>
270-
<key type="i" name="workspace-switch-duration">
271-
<default>300</default>
272-
<summary>Duration of the workspace switch animation</summary>
273-
<description>DEPRECATED: This key is deprecated and ignored.</description>
274-
</key>
275-
<key type="i" name="menu-duration">
276-
<default>150</default>
277-
<summary>Duration of the menu mapping animation</summary>
278-
<description>DEPRECATED: This key is deprecated and ignored.</description>
279-
</key>
280-
</schema>
281-
282-
<schema path="/org/pantheon/desktop/gala/shadows/" id="org.pantheon.desktop.gala.shadows">
283-
<key type="as" name="normal-focused">
284-
<default>['20', '-1', '0', '15', '100']</default>
285-
<summary>Defines the shadow of normal focused windows</summary>
286-
<description>DEPRECATED: This key is deprecated and ignored.</description>
287-
</key>
288-
<key type="as" name="normal-unfocused">
289-
<default>['6', '-1', '0', '4', '80']</default>
290-
<summary>Defines the shadow of a normal unfocused window</summary>
291-
<description>DEPRECATED: This key is deprecated and ignored.</description>
292-
</key>
293-
<key type="as" name="menu">
294-
<default>['6', '-1', '0', '4', '80']</default>
295-
<summary>Defines the shadow of a menu</summary>
296-
<description>DEPRECATED: This key is deprecated and ignored.</description>
297-
</key>
298-
<key type="as" name="dialog-focused">
299-
<default>['12', '-1', '0', '4', '100']</default>
300-
<summary>Defines the shadow of a focused dialog</summary>
301-
<description>DEPRECATED: This key is deprecated and ignored.</description>
302-
</key>
303-
<key type="as" name="dialog-unfocused">
304-
<default>['6', '-1', '0', '4', '80']</default>
305-
<summary>Defines the shadow of an unfocused dialog</summary>
306-
<description>DEPRECATED: This key is deprecated and ignored.</description>
307-
</key>
308-
</schema>
309-
310-
<schema path="/org/pantheon/desktop/gala/notifications/" id="org.pantheon.desktop.gala.notifications">
311-
<key type="b" name="do-not-disturb">
312-
<default>false</default>
313-
<summary>Disable all notifications</summary>
314-
<description>DEPRECATED: This key is deprecated and ignored.</description>
315-
</key>
316-
<child name="applications" schema="org.pantheon.desktop.gala.notifications.application" />
317-
</schema>
318-
319-
<schema id="org.pantheon.desktop.gala.notifications.application">
320-
<key type="b" name="bubbles">
321-
<default>true</default>
322-
<summary>Enable bubbles</summary>
323-
<description>DEPRECATED: This key is deprecated and ignored.</description>
324-
</key>
325-
<key type="b" name="sounds">
326-
<default>true</default>
327-
<summary>Enable sounds</summary>
328-
<description>DEPRECATED: This key is deprecated and ignored.</description>
329-
</key>
330-
<key type="b" name="remember">
331-
<default>true</default>
332-
<summary>Show missed notifications in notification center</summary>
333-
<description>DEPRECATED: This key is deprecated and ignored.</description>
334-
</key>
335-
</schema>
336-
337-
<schema path="/org/pantheon/desktop/gala/mask-corners/" id="org.pantheon.desktop.gala.mask-corners">
338-
<key type="b" name="enable">
339-
<default>true</default>
340-
<summary>Enable rounded corner mask</summary>
341-
<description>DEPRECATED: This setting is no longer used</description>
342-
</key>
343-
<key type="i" name="corner-radius">
344-
<default>4</default>
345-
<range min="1" max="32"/>
346-
<summary>Corner radius</summary>
347-
<description>DEPRECATED: This setting is no longer used</description>
348-
</key>
349-
<key type="b" name="disable-on-fullscreen">
350-
<default>true</default>
351-
<summary>Disable corner mask on fullscreen</summary>
352-
<description>DEPRECATED: This setting is no longer used</description></key>
353-
<key type="b" name="only-on-primary">
354-
<default>false</default>
355-
<summary>Only show corner masks on primary monitor</summary>
356-
<description>DEPRECATED: This setting is no longer used</description>
357-
</key>
358193
</schema>
359194

360195
<enum id="GesturePinch">

data/io.elementary.desktop.wm.shell

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ launch-on-x=true
33
args=io.elementary.wingpanel
44

55
[io.elementary.dock]
6-
launch-on-x=false
6+
launch-on-x=true
77
args=io.elementary.dock

0 commit comments

Comments
 (0)