Skip to content

Commit ad90e0c

Browse files
jtaalajtaala
committed
Merge branch 'develop' into release
2 parents 9ed8edc + 2e55045 commit ad90e0c

File tree

8 files changed

+242
-75
lines changed

8 files changed

+242
-75
lines changed

‎WinpropsRow.ui

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,73 @@
191191
</child>
192192
</object>
193193
</child>
194+
<child>
195+
<object class="GtkGrid">
196+
<property name="focusable">False</property>
197+
<property name="margin_start">12</property>
198+
<property name="margin_end">12</property>
199+
<property name="margin_top">6</property>
200+
<property name="margin_bottom">6</property>
201+
<property name="column_spacing">32</property>
202+
<child>
203+
<object class="GtkLabel">
204+
<property name="focusable">False</property>
205+
<property name="hexpand">1</property>
206+
<property name="use_markup">True</property>
207+
<property name="label" translatable="yes">Insert into workspace</property>
208+
<property name="xalign">0</property>
209+
<layout>
210+
<property name="column">0</property>
211+
<property name="row">0</property>
212+
</layout>
213+
</object>
214+
</child>
215+
<child>
216+
<object class="GtkComboBoxText" id="space">
217+
<property name="focusable">False</property>
218+
<property name="hexpand">0</property>
219+
<property name="width-request">120</property>
220+
<!-- <property name="width_chars">12</property> -->
221+
<!-- <property name="max_width_chars">12</property> -->
222+
<layout>
223+
<property name="column">2</property>
224+
<property name="row">0</property>
225+
</layout>
226+
</object>
227+
</child>
228+
</object>
229+
</child>
230+
<child>
231+
<object class="GtkGrid">
232+
<property name="focusable">False</property>
233+
<property name="margin_start">12</property>
234+
<property name="margin_end">12</property>
235+
<property name="margin_top">6</property>
236+
<property name="margin_bottom">6</property>
237+
<property name="column_spacing">32</property>
238+
<child>
239+
<object class="GtkLabel">
240+
<property name="focusable">False</property>
241+
<property name="hexpand">1</property>
242+
<property name="use_markup">True</property>
243+
<property name="label" translatable="yes">Focus window after inserting into workspace</property>
244+
<property name="xalign">0</property>
245+
<layout>
246+
<property name="column">0</property>
247+
<property name="row">0</property>
248+
</layout>
249+
</object>
250+
</child>
251+
<child>
252+
<object class="GtkSwitch" id="focus">
253+
<layout>
254+
<property name="column">2</property>
255+
<property name="row">0</property>
256+
</layout>
257+
</object>
258+
</child>
259+
</object>
260+
</child>
194261
</object>
195262
</child>
196263
<child>

‎examples/keybindings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ function cycleEdgeSnap(binding = "<Super>u") {
305305

306306
function reorderWorkspace(bindingUp = "<Alt><Super>Page_Up", bindingDown = "<Alt><Super>Page_Down") {
307307
if (!global.workspace_manager.reorder_workspace) {
308-
console.log("Reorder workspaces not supported by this gnome-shell version");
308+
console.warn("Reorder workspaces not supported by this gnome-shell version");
309309
return;
310310
}
311311
function moveWorkspace(dir, metaWindow, space) {

‎metadata.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"url": "https://github.com/paperwm/PaperWM",
66
"settings-schema": "org.gnome.shell.extensions.paperwm",
77
"shell-version": [ "45", "46", "47" ],
8-
"version-name": "47.0.0",
8+
"version-name": "47.1.0",
99
"donations": {
10-
"buymeacoffee": "jaytaala",
11-
"patreon": "valpackett"
10+
"buymeacoffee": "jaytaala"
1211
}
1312
}

‎patches.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export function registerOverrideProp(obj, name, override, warn = true) {
7272
// check if prop exists
7373
const exists = obj?.[name];
7474
if (!exists && warn) {
75-
console.log(`#PaperWM: attempt to override prop for '${name}' failed: is null or undefined`);
75+
console.warn(`#PaperWM: attempt to override prop for '${name}' failed: is null or undefined`);
7676
}
7777

7878
let saved = getSavedProp(obj, name) ?? obj[name];
@@ -94,7 +94,7 @@ export function registerOverridePrototype(obj, name, override) {
9494
// check if method for prototype exists
9595
const exists = obj?.prototype?.[name];
9696
if (!exists) {
97-
console.log(`#PaperWM: attempt to override prototype for '${name}' failed: is null or undefined`);
97+
console.warn(`#PaperWM: attempt to override prototype for '${name}' failed: is null or undefined`);
9898
}
9999

100100
registerOverrideProp(obj.prototype, name, override);

0 commit comments

Comments
 (0)