Skip to content

Commit a61a761

Browse files
committed
Merge branch 'develop' into release
2 parents 9483de3 + b86e7b8 commit a61a761

File tree

2 files changed

+63
-6
lines changed

2 files changed

+63
-6
lines changed

Settings.ui

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<property name="upper">99</property>
4545
<property name="step_increment">1</property>
4646
<property name="page_increment">10</property>
47+
</object>
48+
<object class="GtkAdjustment" id="animation_time_adjustment">
49+
<property name="upper">9.99</property>
50+
<property name="lower">0.03</property>
51+
<property name="step_increment">0.01</property>
52+
<property name="page_increment">0.1</property>
4753
</object>
4854
<object class="GtkAdjustment" id="minimap_scale">
4955
<property name="upper">95</property>
@@ -463,7 +469,7 @@
463469
<property name="activatable">False</property>
464470
<property name="focusable">False</property>
465471
<child>
466-
<object class="GtkGrid" id="workspace_grid9">
472+
<object class="GtkGrid">
467473
<property name="focusable">False</property>
468474
<property name="margin_start">12</property>
469475
<property name="margin_end">12</property>
@@ -472,7 +478,7 @@
472478
<property name="row_spacing">12</property>
473479
<property name="column_spacing">32</property>
474480
<child>
475-
<object class="GtkLabel" id="workspace_label4">
481+
<object class="GtkLabel">
476482
<property name="focusable">False</property>
477483
<property name="hexpand">1</property>
478484
<property name="label" translatable="yes">Vertical sensitivity</property>
@@ -500,7 +506,7 @@
500506
</object>
501507
</child>
502508
<child>
503-
<object class="GtkLabel" id="workspace_label6">
509+
<object class="GtkLabel">
504510
<property name="focusable">False</property>
505511
<property name="hexpand">1</property>
506512
<property name="label" translatable="yes">Vertical friction</property>
@@ -555,7 +561,52 @@
555561
<property name="activatable">False</property>
556562
<property name="focusable">False</property>
557563
<child>
558-
<object class="GtkGrid" id="workspace_grid11">
564+
<object class="GtkGrid">
565+
<property name="focusable">False</property>
566+
<property name="tooltip_text" translatable="yes">Sets the duration of PaperWM animated transitions (e.g. switching windows, workspaces etc.). Lower values result in faster transitions.</property>
567+
<property name="margin_start">12</property>
568+
<property name="margin_end">12</property>
569+
<property name="margin_top">6</property>
570+
<property name="margin_bottom">6</property>
571+
<property name="column_spacing">32</property>
572+
<child>
573+
<object class="GtkLabel">
574+
<property name="focusable">False</property>
575+
<property name="hexpand">1</property>
576+
<property name="label" translatable="yes">Animation / transition time (seconds)</property>
577+
<property name="use_markup">1</property>
578+
<property name="xalign">0</property>
579+
<layout>
580+
<property name="column">0</property>
581+
<property name="row">0</property>
582+
</layout>
583+
</object>
584+
</child>
585+
<child>
586+
<object class="GtkSpinButton" id="animation_time_spin">
587+
<property name="width_chars">3</property>
588+
<property name="max_width_chars">3</property>
589+
<property name="adjustment">animation_time_adjustment</property>
590+
<property name="numeric">1</property>
591+
<property name="digits">2</property>
592+
<property name="snap_to_ticks">1</property>
593+
<property name="update_policy">if-valid</property>
594+
<layout>
595+
<property name="column">1</property>
596+
<property name="row">0</property>
597+
</layout>
598+
</object>
599+
</child>
600+
</object>
601+
</child>
602+
</object>
603+
</child>
604+
<child>
605+
<object class="GtkListBoxRow">
606+
<property name="activatable">False</property>
607+
<property name="focusable">False</property>
608+
<child>
609+
<object class="GtkGrid">
559610
<property name="focusable">False</property>
560611
<property name="tooltip_text" translatable="yes">This setting controls the "size" of mini-map tiles as compared to their actual window size (e.g. "15" corresponds to a mini-map tile size being approximately 15% of the actual window size)</property>
561612
<property name="margin_start">12</property>
@@ -564,7 +615,7 @@
564615
<property name="margin_bottom">6</property>
565616
<property name="column_spacing">32</property>
566617
<child>
567-
<object class="GtkLabel" id="workspace_label11">
618+
<object class="GtkLabel">
568619
<property name="focusable">False</property>
569620
<property name="hexpand">1</property>
570621
<property name="label" translatable="yes">Mini-map scale &lt;i&gt;(0 hides Mini-map)&lt;/i&gt;</property>
@@ -599,7 +650,7 @@
599650
<property name="activatable">False</property>
600651
<property name="focusable">False</property>
601652
<child>
602-
<object class="GtkGrid" id="workspace_grid10">
653+
<object class="GtkGrid">
603654
<property name="focusable">False</property>
604655
<property name="margin_start">12</property>
605656
<property name="margin_end">12</property>

prefs.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ var SettingsWidget = class SettingsWidget {
175175
vFric.connect('value-changed', fricChanged);
176176
hFric.connect('value-changed', fricChanged);
177177

178+
let animationTime = this.builder.get_object('animation_time_spin');
179+
animationTime.set_value(this._settings.get_double('animation-time'));
180+
animationTime.connect('value-changed', () => {
181+
this._settings.set_double('animation-time', animationTime.get_value());
182+
});
183+
178184
let minimapScale = this.builder.get_object('minimap_scale_spin');
179185
minimapScale.set_value(this._settings.get_double('minimap-scale') * 100.0);
180186
minimapScale.connect('value-changed', () => {

0 commit comments

Comments
 (0)