Skip to content

Commit ae718bf

Browse files
Thesola10Thesola10
authored
Merge branch 'develop' into makefile
2 parents 3c28f1a + 1ff0d05 commit ae718bf

File tree

11 files changed

+228
-235
lines changed

11 files changed

+228
-235
lines changed

‎KeybindingsComboRow.ui‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@
8383
<object class="GtkBox" id="about">
8484
<property name="focusable">False</property>
8585
<property name="orientation">vertical</property>
86-
<property name="margin-start">12</property>
87-
<property name="margin-end">12</property>
8886
<property name="margin-top">12</property>
8987
<property name="margin-bottom">12</property>
9088
<property name="spacing">8</property>

‎KeybindingsPane.ui‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,28 @@
44
<template class="KeybindingsPane" parent="GtkBox">
55
<property name="focusable">False</property>
66
<property name="orientation">vertical</property>
7+
<property name="width_request">580</property>
78
<child>
89
<object class="GtkSearchEntry" id="search">
910
<property name="activates-default">False</property>
1011
<property name="halign">center</property>
11-
<property name="margin-top">12</property>
12-
<signal name="search-changed"
13-
handler="_onSearchChanged" />
12+
<property name="margin-bottom">12px</property>
13+
<signal name="search-changed" handler="_onSearchChanged" />
1414
</object>
1515
</child>
1616
<child>
17-
<object class="GtkScrolledWindow">
18-
<property name="hscrollbar_policy">never</property>
17+
<object class="GtkScrolledWindow" id="scrolledWindow">
1918
<child>
2019
<object class="GtkViewport">
2120
<property name="focusable">False</property>
2221
<property name="vexpand">True</property>
2322
<child>
2423
<object class="GtkListBox" id="listbox">
25-
<property name="hexpand">True</property>
26-
<property name="margin_start">36</property>
27-
<property name="margin_end">36</property>
28-
<property name="margin_top">16</property>
29-
<property name="margin_bottom">36</property>
30-
<property name="width_request">480</property>
3124
<style>
3225
<class name="keybindings" />
3326
<class name="frame" />
3427
</style>
35-
<signal name="row-activated"
36-
handler="_onRowActivated" />
28+
<signal name="row-activated" handler="_onRowActivated" />
3729
</object>
3830
</child>
3931
</object>

‎KeybindingsRow.ui‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
<property name="selectable">False</property>
99
<property name="activatable">True</property>
1010
<property name="focusable">True</property>
11-
1211
<child>
1312
<object class="GtkBox">
1413
<property name="orientation">vertical</property>
15-
1614
<child>
1715
<object class="GtkBox" id="header">
1816
<property name="spacing">12</property>

‎Settings.ui‎

Lines changed: 178 additions & 179 deletions
Large diffs are not rendered by default.

‎WinpropsPane.ui‎

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,39 @@
44
<template class="WinpropsPane" parent="GtkBox">
55
<property name="focusable">False</property>
66
<property name="orientation">vertical</property>
7+
<property name="width_request">580</property>
78
<child>
89
<object class="GtkBox">
9-
<property name="focusable">False</property>
10-
<property name="halign">center</property>
11-
<property name="orientation">horizontal</property>
12-
<property name="spacing">12</property>
13-
<child>
14-
<object class="GtkSearchEntry" id="search">
15-
<property name="activates-default">False</property>
16-
<property name="halign">center</property>
17-
<property name="margin-top">12</property>
18-
</object>
19-
</child>
20-
<child>
21-
<object class="GtkButton" id="addButton">
22-
<property name="label" translatable="yes">Add Winprop</property>
23-
<property name="hexpand">True</property>
24-
<property name="halign">center</property>
25-
<property name="margin-top">12px</property>
26-
<signal name="clicked" handler="_onAddButtonClicked" />
27-
<style>
28-
<class name="winprops" />
29-
<class name="add-button" />
30-
<class name="suggested-action" />
31-
</style>
32-
</object>
33-
</child>
10+
<property name="focusable">False</property>
11+
<property name="halign">center</property>
12+
<property name="orientation">horizontal</property>
13+
<property name="spacing">12</property>
14+
<child>
15+
<object class="GtkSearchEntry" id="search">
16+
<property name="activates-default">False</property>
17+
<property name="halign">center</property>
18+
</object>
19+
</child>
20+
<child>
21+
<object class="GtkButton" id="addButton">
22+
<property name="label" translatable="yes">Add Winprop</property>
23+
<property name="halign">center</property>
24+
<signal name="clicked" handler="_onAddButtonClicked" />
25+
<style>
26+
<class name="winprops" />
27+
<class name="add-button" />
28+
<class name="suggested-action" />
29+
</style>
30+
</object>
31+
</child>
3432
</object>
3533
</child>
3634
<child>
3735
<object class="GtkLabel">
3836
<property name="label" translatable="yes">&lt;i&gt;Winprops allow setting window properties to be applied to new windows&lt;/i&gt;</property>
3937
<property name="max_width_chars">-1</property>
4038
<property name="margin-top">12px</property>
41-
<property name="margin-bottom">2px</property>
39+
<property name="margin-bottom">12px</property>
4240
<property name="use_markup">True</property>
4341
</object>
4442
</child>
@@ -51,15 +49,8 @@
5149
<property name="vexpand">True</property>
5250
<child>
5351
<object class="GtkListBox" id="listbox">
54-
<property name="hexpand">True</property>
55-
<property name="margin_start">36</property>
56-
<property name="margin_end">36</property>
57-
<property name="margin_top">16</property>
58-
<property name="margin_bottom">36</property>
59-
<property name="width_request">480</property>
6052
<property name="show_separators">True</property>
6153
<style>
62-
<class name="keybindings" />
6354
<class name="winprops" />
6455
<class name="frame" />
6556
</style>

‎WinpropsRow.ui‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@
217217
<property name="focusable">False</property>
218218
<property name="hexpand">0</property>
219219
<property name="width-request">120</property>
220-
<!-- <property name="width_chars">12</property> -->
221-
<!-- <property name="max_width_chars">12</property> -->
222220
<layout>
223221
<property name="column">2</property>
224222
<property name="row">0</property>

‎gestures.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@ export function enable(extension) {
113113
return Clutter.EVENT_PROPAGATE;
114114
}
115115

116+
// if our vertical gesture is disabled, propagate always!
117+
// (might be used for a vertical-workspaces addon)
118+
if (gestureWorkspaceFingers() === 0) {
119+
swipeTrackersEnable();
120+
return Clutter.EVENT_PROPAGATE;
121+
}
122+
116123
let dir_y = -dy * natural * Settings.prefs.swipe_sensitivity[1];
117124
// if not Tiling.inPreview and swipe is UP => propagate event to overview
118125
if (!Tiling.inPreview && dir_y > 0) {

‎metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"url": "https://github.com/paperwm/PaperWM",
66
"settings-schema": "org.gnome.shell.extensions.paperwm",
77
"shell-version": [ "45", "46", "47", "48" ],
8-
"version-name": "48.0.0"
8+
"version-name": "48.0.2"
99
}

‎prefs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class PaperWMPrefs extends ExtensionPreferences {
3838
} catch (e) { }
3939

4040
const selectedTab = selectedWorkspace !== null ? 1 : 0;
41-
window.set_size_request(626, 700);
41+
window.set_size_request(700, 750);
4242
new SettingsWidget(
4343
this,
4444
window,

‎prefsKeybinding.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,7 @@ export const KeybindingsPane = GObject.registerClass({
10561056
use_markup: true,
10571057
label: _(`<b>${sections[row.keybinding.section]}</b>`),
10581058
xalign: 0.0,
1059-
margin_top: 24,
1060-
margin_bottom: 6,
1059+
halign: Gtk.Align.CENTER,
10611060
margin_start: 12,
10621061
margin_end: 12,
10631062
}));

0 commit comments

Comments
 (0)