Skip to content

Added feature to resize horizontally & apply XY position offset #1833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meepak wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added feature to resize horizontally & apply XY position offset #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4e6ddf
Add window-size-secondary setting for independent horizontal/vertical…
meepak Mar 22, 2026
e396f41
Keep the in-memory default aligned with the schema.
meepak Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ddterm/app/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,17 @@ export class Application extends Gtk.Application {
if (!this.#settings.get_boolean('window-maximize'))
this.#adjust_double_setting('window-size', SIZE_STEP);
},
'window-size-secondary-dec': () => {
if (this.#settings.get_boolean('window-maximize'))
this.#settings.set_double('window-size-secondary', 1.0 - SIZE_STEP);
else
this.#adjust_double_setting('window-size-secondary', -SIZE_STEP);
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.

'window-size-secondary-inc': () => {
if (!this.#settings.get_boolean('window-maximize'))
this.#adjust_double_setting('window-size-secondary', SIZE_STEP);
},
'background-opacity-dec': () => {
this.#adjust_double_setting('background-opacity', -OPACITY_STEP);
},
Expand Down Expand Up @@ -416,6 +427,8 @@ export class Application extends Gtk.Application {
'shortcut-window-hide': 'win.hide',
'shortcut-window-size-inc': 'app.window-size-inc',
'shortcut-window-size-dec': 'app.window-size-dec',
'shortcut-window-size-secondary-inc': 'app.window-size-secondary-inc',
'shortcut-window-size-secondary-dec': 'app.window-size-secondary-dec',
'shortcut-background-opacity-inc': 'app.background-opacity-inc',
'shortcut-background-opacity-dec': 'app.background-opacity-dec',
'shortcut-toggle-maximize': 'app.window-maximize',
Expand Down
48 changes: 17 additions & 31 deletions ddterm/pref/positionsize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import Gtk from 'gi://Gtk';

import { PreferencesGroup, ComboRow, ScaleRow } from './util.js';
import { PreferencesGroup, ComboRow } from './util.js';
import { Monitor } from '../util/displayconfig.js';

class SpecialMonitor extends Monitor {
Expand Down Expand Up @@ -280,38 +280,24 @@ export class PositionSizeGroup extends PreferencesGroup {
},
});

const window_size_adjustment = new Gtk.Adjustment({
upper: 1,
step_increment: 0.01,
page_increment: 0.10,
});

this.settings.bind(
'window-size',
window_size_adjustment,
'value',
Gio.SettingsBindFlags.DEFAULT
);

const window_size_row = new ScaleRow({
adjustment: window_size_adjustment,
digits: 2,
round_digits: 2,
visible: true,
use_underline: true,
this.add_scale_row({
key: 'window-size',
adjustment: new Gtk.Adjustment({
upper: 1,
step_increment: 0.01,
page_increment: 0.10,
}),
title: this.gettext('Window _Size'),
});

const percent_format = new Intl.NumberFormat(undefined, { style: 'percent' });
window_size_row.set_format_value_func((_, v) => percent_format.format(v));

this.settings.bind_writable(
'window-size',
window_size_row,
'sensitive',
false
);

this.add(window_size_row);
this.add_scale_row({
key: 'window-size-secondary',
adjustment: new Gtk.Adjustment({
upper: 1,
step_increment: 0.01,
page_increment: 0.10,
}),
title: this.gettext('Window Size Secondary'),
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}
10 changes: 10 additions & 0 deletions ddterm/pref/shortcuts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,16 @@ export class ApplicationShortcutGroup extends ShortcutGroup {
title: this.gettext('Decrease Window Size'),
});

this.add_shortcut_row({
key: 'shortcut-window-size-secondary-inc',
title: this.gettext('Increase Secondary Window Size'),
});

this.add_shortcut_row({
key: 'shortcut-window-size-secondary-dec',
title: this.gettext('Decrease Secondary Window Size'),
});

this.add_shortcut_row({
key: 'shortcut-background-opacity-inc',
title: this.gettext('Increase Background Opacity'),
Expand Down
40 changes: 40 additions & 0 deletions ddterm/pref/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,38 @@ export class ScaleRow extends ActionRow {
}
}

function create_scale_row({
settings,
key,
adjustment,
flags = Gio.SettingsBindFlags.DEFAULT,
percent = true,
...params
}) {
const row = new ScaleRow({
visible: true,
use_underline: true,
adjustment,
...params,
});

settings.bind(key, adjustment, 'value', flags);

settings.bind_writable(
key,
row,
'sensitive',
false
);

if (percent) {
const percent_format = new Intl.NumberFormat(undefined, { style: 'percent' });
row.set_format_value_func((_, v) => percent_format.format(v));
}

return row;
}

export class ExpanderRow extends AdwOrHdy.ExpanderRow {
static [GObject.GTypeName] = 'DDTermExpanderRow';

Expand Down Expand Up @@ -676,6 +708,14 @@ export class PreferencesGroup extends AdwOrHdy.PreferencesGroup {

return row;
}

add_scale_row(params) {
const row = create_scale_row({ settings: this.settings, ...params });

this.add(row);

return row;
}
}

export class PreferencesPage extends AdwOrHdy.PreferencesPage {
Expand Down
47 changes: 35 additions & 12 deletions ddterm/shell/geometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ export const WindowGeometry = GObject.registerClass({
1,
0.6
),
'window-size-secondary': GObject.ParamSpec.double(
'window-size-secondary',
null,
null,
GObject.ParamFlags.READWRITE | GObject.ParamFlags.EXPLICIT_NOTIFY,
0,
1,
1
),
Comment thread
coderabbitai[bot] marked this conversation as resolved.
'window-position': GObject.ParamSpec.enum(
'window-position',
null,
Expand Down Expand Up @@ -124,6 +133,7 @@ export const WindowGeometry = GObject.registerClass({
);

this.connect('notify::window-size', this.#update_target_rect.bind(this));
this.connect('notify::window-size-secondary', this.#update_target_rect.bind(this));
this.connect('notify::window-position', this.#update_window_position.bind(this));
this.connect('notify::window-monitor', this.update_monitor.bind(this));
this.connect('notify::window-monitor-connector', this.update_monitor.bind(this));
Expand All @@ -139,24 +149,35 @@ export const WindowGeometry = GObject.registerClass({
}
}

static get_target_rect(workarea, monitor_scale, size, window_pos) {
static get_target_rect(workarea, monitor_scale, size, size_secondary, window_pos) {
const target_rect = workarea.copy();

if (size === 1)
return target_rect;

if (window_pos === Meta.Side.LEFT || window_pos === Meta.Side.RIGHT) {
target_rect.width *= size;
target_rect.width -= target_rect.width % monitor_scale;
if (size !== 1) {
target_rect.width *= size;
target_rect.width -= target_rect.width % monitor_scale;

if (window_pos === Meta.Side.RIGHT)
target_rect.x += workarea.width - target_rect.width;
} else {
target_rect.height *= size;
if (window_pos === Meta.Side.RIGHT)
target_rect.x += workarea.width - target_rect.width;
}
target_rect.height *= size_secondary;
target_rect.height -= target_rect.height % monitor_scale;
target_rect.height = Math.floor(target_rect.height);

target_rect.y += Math.floor((workarea.height - target_rect.height) / 2);
} else {
if (size !== 1) {
target_rect.height *= size;
target_rect.height -= target_rect.height % monitor_scale;

if (window_pos === Meta.Side.BOTTOM)
target_rect.y += workarea.height - target_rect.height;
}
target_rect.width *= size_secondary;
target_rect.width -= target_rect.width % monitor_scale;
target_rect.width = Math.floor(target_rect.width);

if (window_pos === Meta.Side.BOTTOM)
target_rect.y += workarea.height - target_rect.height;
target_rect.x += Math.floor((workarea.width - target_rect.width) / 2);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return target_rect;
Expand All @@ -165,6 +186,7 @@ export const WindowGeometry = GObject.registerClass({
bind_settings(settings) {
[
'window-size',
'window-size-secondary',
'window-position',
'window-monitor',
'window-monitor-connector',
Expand Down Expand Up @@ -356,6 +378,7 @@ export const WindowGeometry = GObject.registerClass({
this.#workarea,
Math.floor(this.#monitor_scale),
this.window_size,
this.window_size_secondary,
this.window_position
);

Expand Down
12 changes: 10 additions & 2 deletions ddterm/shell/wm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export const WindowManager = GObject.registerClass({
'changed::window-above': this.#set_window_above.bind(this),
'changed::window-stick': this.#set_window_stick.bind(this),
'changed::window-size': this.#disable_window_maximize_setting.bind(this),
'changed::window-size-secondary': this.#disable_window_maximize_setting.bind(this),
'changed::window-maximize': this.#set_window_maximized.bind(this),
'changed::hide-when-focus-lost': this.#setup_hide_when_focus_lost.bind(this),
}).map(
Expand Down Expand Up @@ -578,11 +579,17 @@ export const WindowManager = GObject.registerClass({
this.logger?.log('Updating size setting on grab end');

const frame_rect = win.get_frame_rect();
const size = this.geometry.orientation === Clutter.Orientation.HORIZONTAL

const primary = this.geometry.orientation === Clutter.Orientation.HORIZONTAL
? frame_rect.width / this.geometry.workarea.width
: frame_rect.height / this.geometry.workarea.height;

this.settings.set_double('window-size', Math.min(1.0, size));
const secondary = this.geometry.orientation === Clutter.Orientation.HORIZONTAL
? frame_rect.height / this.geometry.workarea.height
: frame_rect.width / this.geometry.workarea.width;

this.settings.set_double('window-size', Math.min(1.0, primary));
this.settings.set_double('window-size-secondary', Math.min(1.0, secondary));
}

#unmaximize_for_resize(flags) {
Expand All @@ -596,6 +603,7 @@ export const WindowManager = GObject.registerClass({
// There is a _update_window_geometry() call after successful unmaximize.
// It must set window size to 100%.
this.settings.set_double('window-size', 1.0);
this.settings.set_double('window-size-secondary', 1.0);

Main.wm.skipNextEffect(this.#actor);
this.#set_unmaximize_flags(flags);
Expand Down
11 changes: 11 additions & 0 deletions schemas/com.github.amezin.ddterm.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
<default>0.6</default>
<range min="0.0" max="1.0"/>
</key>
<key name="window-size-secondary" type="d">
<default>1.0</default>
<range min="0.0" max="1.0"/>
</key>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
<key name="window-maximize" type="b">
<default>false</default>
</key>
Expand Down Expand Up @@ -385,6 +389,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
<key name="shortcut-window-size-dec" type="as">
<default><![CDATA[['<Ctrl>Up']]]></default>
</key>
<key name="shortcut-window-size-secondary-inc" type="as">
<default><![CDATA[['<Ctrl><Alt>Down']]]></default>
</key>

<key name="shortcut-window-size-secondary-dec" type="as">
<default><![CDATA[['<Ctrl><Alt>Up']]]></default>
</key>
<key name="shortcut-background-opacity-inc" type="as">
<default><![CDATA[[]]]></default>
</key>
Expand Down
Loading