morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add more preview sizing options

Browse Source
This commit is contained in:
Charles Gagnon
2019-05-29 21:24:25 -04:00
parent 42ecac85e1
commit 045350db82
4 changed files with 250 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

307
Settings.ui
View File

@@ -2207,17 +2207,18 @@
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow" id="listbox_preview_timeout">
<object class="GtkListBoxRow" id="listboxrow_times">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_preview_timeout">
<object class="GtkGrid" id="grid_times">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkSpinButton" id="preview_timeout_spinbutton">
@@ -2247,23 +2248,6 @@
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow" id="listboxrow_leave_timeout">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_leave_timeout">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkLabel" id="leave_timeout_label">
<property name="visible">True</property>
@@ -2274,7 +2258,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -2282,32 +2266,16 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property>
<property name="text">0</property>
<property name="text">25</property>
<property name="adjustment">leave_timeout_adjustment</property>
<property name="numeric">True</property>
<property name="value">25</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow" id="listboxrow_animation_time">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_animation_time">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkLabel" id="animation_time_label">
<property name="visible">True</property>
@@ -2318,7 +2286,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -2332,7 +2300,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
</object>
@@ -2383,32 +2351,19 @@
</object>
</child>
<child>
<object class="GtkListBoxRow" id="listbox_preview_size">
<object class="GtkListBoxRow" id="listboxrow_sizes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_preview_size">
<object class="GtkGrid" id="grid_sizes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkSpinButton" id="preview_size_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property>
<property name="text">0</property>
<property name="adjustment">preview_size_adjustment</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="preview_size_label">
<property name="visible">True</property>
@@ -2421,81 +2376,36 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">3</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow" id="listbox_preview_fixed_size">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_preview_fixed_size">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkLabel" id="preview_fixed_size_label">
<object class="GtkSpinButton" id="preview_size_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property>
<property name="text">0</property>
<property name="adjustment">preview_size_adjustment</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="preview_aspect_ratio_y_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Use a fixed size for the window previews</property>
<property name="label" translatable="yes">Window aspect ratio Y (height)</property>
<property name="use_markup">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="preview_fixed_size_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow" id="listbox_preview_padding">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="grid_preview_padding">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkSpinButton" id="preview_padding_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property>
<property name="text">50</property>
<property name="adjustment">preview_padding_adjustment</property>
<property name="numeric">True</property>
<property name="value">50</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
@@ -2509,7 +2419,160 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="top_attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="preview_padding_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property>
<property name="text">50</property>
<property name="adjustment">preview_padding_adjustment</property>
<property name="numeric">True</property>
<property name="value">50</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkComboBoxText" id="preview_aspect_ratio_x_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<items>
<item id="1" translatable="yes">1</item>
<item id="2" translatable="yes">2</item>
<item id="3" translatable="yes">3</item>
<item id="4" translatable="yes">4</item>
<item id="5" translatable="yes">5</item>
<item id="6" translatable="yes">6</item>
<item id="7" translatable="yes">7</item>
<item id="8" translatable="yes">8</item>
<item id="9" translatable="yes">9</item>
<item id="10" translatable="yes">10</item>
<item id="11" translatable="yes">11</item>
<item id="12" translatable="yes">12</item>
<item id="13" translatable="yes">13</item>
<item id="14" translatable="yes">14</item>
<item id="15" translatable="yes">15</item>
<item id="16" translatable="yes">16</item>
<item id="17" translatable="yes">17</item>
<item id="18" translatable="yes">18</item>
<item id="19" translatable="yes">19</item>
<item id="20" translatable="yes">20</item>
<item id="21" translatable="yes">21</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="preview_aspect_ratio_x_fixed_togglebutton">
<property name="label" translatable="yes">Fixed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="preview_aspect_ratio_x_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Window aspect ratio X (width)</property>
<property name="use_markup">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkComboBoxText" id="preview_aspect_ratio_y_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<items>
<item id="1" translatable="yes">1</item>
<item id="2" translatable="yes">2</item>
<item id="3" translatable="yes">3</item>
<item id="4" translatable="yes">4</item>
<item id="5" translatable="yes">5</item>
<item id="6" translatable="yes">6</item>
<item id="7" translatable="yes">7</item>
<item id="8" translatable="yes">8</item>
<item id="9" translatable="yes">9</item>
<item id="10" translatable="yes">10</item>
<item id="11" translatable="yes">11</item>
<item id="12" translatable="yes">12</item>
<item id="13" translatable="yes">13</item>
<item id="14" translatable="yes">14</item>
<item id="15" translatable="yes">15</item>
<item id="16" translatable="yes">16</item>
<item id="17" translatable="yes">17</item>
<item id="18" translatable="yes">18</item>
<item id="19" translatable="yes">19</item>
<item id="20" translatable="yes">20</item>
<item id="21" translatable="yes">21</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="preview_aspect_ratio_y_fixed_togglebutton">
<property name="label" translatable="yes">Fixed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
</packing>
</child>
</object>

30
prefs.js
View File

@@ -1030,8 +1030,13 @@ const Settings = new Lang.Class({
'active',
Gio.SettingsBindFlags.DEFAULT);
this._settings.bind('window-preview-fixed-size',
this._builder.get_object('preview_fixed_size_switch'),
this._settings.bind('window-preview-fixed-x',
this._builder.get_object('preview_aspect_ratio_x_fixed_togglebutton'),
'active',
Gio.SettingsBindFlags.DEFAULT);
this._settings.bind('window-preview-fixed-y',
this._builder.get_object('preview_aspect_ratio_y_fixed_togglebutton'),
'active',
Gio.SettingsBindFlags.DEFAULT);
@@ -1090,6 +1095,16 @@ const Settings = new Lang.Class({
this._settings.set_int('window-preview-size', widget.get_value());
}));
this._builder.get_object('preview_aspect_ratio_x_combo').set_active_id(this._settings.get_int('window-preview-aspect-ratio-x').toString());
this._builder.get_object('preview_aspect_ratio_x_combo').connect('changed', Lang.bind (this, function(widget) {
this._settings.set_int('window-preview-aspect-ratio-x', parseInt(widget.get_active_id(), 10));
}));
this._builder.get_object('preview_aspect_ratio_y_combo').set_active_id(this._settings.get_int('window-preview-aspect-ratio-y').toString());
this._builder.get_object('preview_aspect_ratio_y_combo').connect('changed', Lang.bind (this, function(widget) {
this._settings.set_int('window-preview-aspect-ratio-y', parseInt(widget.get_active_id(), 10));
}));
this._builder.get_object('preview_padding_spinbutton').set_value(this._settings.get_int('window-preview-padding'));
this._builder.get_object('preview_padding_spinbutton').connect('value-changed', Lang.bind (this, function(widget) {
this._settings.set_int('window-preview-padding', widget.get_value());
@@ -1132,14 +1147,21 @@ const Settings = new Lang.Class({
this._settings.set_value('window-preview-size', this._settings.get_default_value('window-preview-size'));
this._builder.get_object('preview_size_spinbutton').set_value(this._settings.get_int('window-preview-size'));
this._settings.set_value('window-preview-fixed-x', this._settings.get_default_value('window-preview-fixed-x'));
this._settings.set_value('window-preview-fixed-y', this._settings.get_default_value('window-preview-fixed-y'));
this._settings.set_value('window-preview-aspect-ratio-x', this._settings.get_default_value('window-preview-aspect-ratio-x'));
this._builder.get_object('preview_aspect_ratio_x_combo').set_active_id(this._settings.get_int('window-preview-aspect-ratio-x').toString());
this._settings.set_value('window-preview-aspect-ratio-y', this._settings.get_default_value('window-preview-aspect-ratio-y'));
this._builder.get_object('preview_aspect_ratio_y_combo').set_active_id(this._settings.get_int('window-preview-aspect-ratio-y').toString());
this._settings.set_value('window-preview-padding', this._settings.get_default_value('window-preview-padding'));
this._builder.get_object('preview_padding_spinbutton').set_value(this._settings.get_int('window-preview-padding'));
this._settings.set_value('preview-middle-click-close', this._settings.get_default_value('preview-middle-click-close'));
this._settings.set_value('window-preview-fixed-size', this._settings.get_default_value('window-preview-fixed-size'));
this._settings.set_value('window-preview-title-font-size', this._settings.get_default_value('window-preview-title-font-size'));
this._builder.get_object('preview_title_size_spinbutton').set_value(this._settings.get_int('window-preview-title-font-size'));

21
schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
View File

@@ -436,16 +436,31 @@
<summary>Window previews size</summary>
<description>Preferred window previews size</description>
</key>
<key type="b" name="window-preview-fixed-size">
<key type="b" name="window-preview-fixed-x">
<default>false</default>
<summary>Fixed aspect ratio X</summary>
<description>This defines if the window previews use a fixed aspect ratio X.</description>
</key>
<key type="b" name="window-preview-fixed-y">
<default>true</default>
<summary>Window previews fixed size</summary>
<description>This defines if the window previews use a fixed or dynamic size.</description>
<summary>Fixed aspect ratio Y</summary>
<description>This defines if the window previews use a fixed aspect ratio Y.</description>
</key>
<key type="i" name="window-preview-padding">
<default>8</default>
<summary>Window previews padding</summary>
<description>The padding of the window previews</description>
</key>
<key type="i" name="window-preview-aspect-ratio-x">
<default>16</default>
<summary>Aspect ratio X</summary>
<description>The window previews respected aspect ratio X.</description>
</key>
<key type="i" name="window-preview-aspect-ratio-y">
<default>9</default>
<summary>Aspect ratio Y</summary>
<description>The window previews respected aspect ratio Y.</description>
</key>
<key type="b" name="isolate-workspaces">
<default>false</default>
<summary>Provide workspace isolation</summary>

42
windowPreview.js
View File

@@ -46,11 +46,12 @@ const FOCUSED_COLOR_OFFSET = 24;
const HEADER_COLOR_OFFSET = -12;
const PEEK_INDEX_PROP = '_dtpPeekInitialIndex';
var headerHeight = 0;
var isLeftButtons = false;
var isTopHeader = true;
var scaleFactor = 1;
var animationTime = 0;
let headerHeight = 0;
let isLeftButtons = false;
let isTopHeader = true;
let scaleFactor = 1;
let animationTime = 0;
let aspectRatio = {};
var PreviewMenu = Utils.defineClass({
Name: 'DashToPanel-PreviewMenu',
@@ -363,6 +364,14 @@ var PreviewMenu = Utils.defineClass({
scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
headerHeight = this._dtpSettings.get_boolean('window-preview-show-title') ? HEADER_HEIGHT * scaleFactor : 0;
animationTime = this._dtpSettings.get_int('window-preview-animation-time') * .001;
aspectRatio.x = {
size: this._dtpSettings.get_int('window-preview-aspect-ratio-x'),
fixed: this._dtpSettings.get_boolean('window-preview-fixed-x')
};
aspectRatio.y = {
size: this._dtpSettings.get_int('window-preview-aspect-ratio-y'),
fixed: this._dtpSettings.get_boolean('window-preview-fixed-y')
};
},
_resetHiddenState: function() {
@@ -902,20 +911,12 @@ var Preview = Utils.defineClass({
},
_getBinSize: function() {
let width = -1;
let height = -1;
let [fixedWidth, fixedHeight] = this._previewDimensions;
if (this._previewMenu._dtpSettings.get_boolean('window-preview-fixed-size')) {
let [fixedWidth, fixedHeight] = this._previewDimensions;
if (this._previewMenu._checkIfLeftOrRight()) {
width = fixedWidth + this._padding * 2;
} else {
height = fixedHeight + this._padding * 2;
}
}
return [width, height];
return [
aspectRatio.x.fixed ? fixedWidth + this._padding * 2 : -1,
aspectRatio.y.fixed ? fixedHeight + this._padding * 2 : -1
];
},
_resizeClone: function(cloneBin) {
@@ -935,16 +936,15 @@ var Preview = Utils.defineClass({
},
_getPreviewDimensions: function() {
let primaryMonitor = Main.layoutManager.primaryMonitor;
let size = this._previewMenu._dtpSettings.get_int('window-preview-size') * scaleFactor;
let w, h;
if (this._previewMenu._checkIfLeftOrRight()) {
w = size;
h = w * primaryMonitor.height / primaryMonitor.width;
h = w * aspectRatio.y.size / aspectRatio.x.size;
} else {
h = size;
w = h * primaryMonitor.width / primaryMonitor.height;
w = h * aspectRatio.x.size / aspectRatio.y.size;
}
return [w, h];