Skip to content
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.

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

Allow splitting with specified size using --split-vertical or --split-horizontal #2208

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions guake/boxes.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,30 +456,30 @@ def replace_child(self, old, new):
def unset_terminal(self, *args):
self.terminal = None

def split_h(self):
return self.split(DualTerminalBox.ORIENT_V)
def split_h(self, split_percentage: int = 50):
return self.split(DualTerminalBox.ORIENT_V, split_percentage)

def split_v(self):
return self.split(DualTerminalBox.ORIENT_H)
def split_v(self, split_percentage: int = 50):
return self.split(DualTerminalBox.ORIENT_H, split_percentage)

def split_h_no_save(self):
return self.split_no_save(DualTerminalBox.ORIENT_V)
def split_h_no_save(self, split_percentage: int = 50):
return self.split_no_save(DualTerminalBox.ORIENT_V, split_percentage)

def split_v_no_save(self):
return self.split_no_save(DualTerminalBox.ORIENT_H)
def split_v_no_save(self, split_percentage: int = 50):
return self.split_no_save(DualTerminalBox.ORIENT_H, split_percentage)

@save_tabs_when_changed
def split(self, orientation):
self.split_no_save(orientation)
def split(self, orientation, split_percentage: int = 50):
self.split_no_save(orientation, split_percentage)

def split_no_save(self, orientation):
def split_no_save(self, orientation, split_percentage: int = 50):
notebook = self.get_notebook()
parent = self.get_parent() # RootTerminalBox

if orientation == DualTerminalBox.ORIENT_H:
position = self.get_allocation().width / 2
position = self.get_allocation().width * ((100 - split_percentage) / 100)
else:
position = self.get_allocation().height / 2
position = self.get_allocation().height * ((100 - split_percentage) / 100)

terminal_box = TerminalBox()
terminal = notebook.terminal_spawn()
Expand Down
4 changes: 2 additions & 2 deletions guake/callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ def on_quit(self, *args):
self.notebook.guake.accel_quit()

def on_split_vertical(self, *args):
self.terminal.get_parent().split_v()
self.terminal.get_parent().split_v(50)

def on_split_horizontal(self, *args):
self.terminal.get_parent().split_h()
self.terminal.get_parent().split_h(50)

def on_close_terminal(self, *args):
self.terminal.kill()
Expand Down
24 changes: 12 additions & 12 deletions guake/dbusiface.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,22 @@ def get_gtktab_name(self, tab_index=0):
def get_selected_uuidtab(self):
return self.guake.get_selected_uuidtab()

@dbus.service.method(DBUS_NAME)
def v_split_current_terminal(self):
self.guake.get_notebook().get_current_terminal().get_parent().split_v()
@dbus.service.method(DBUS_NAME, in_signature="i")
def v_split_current_terminal(self, split_percentage: int):
self.guake.get_notebook().get_current_terminal().get_parent().split_v(split_percentage)

@dbus.service.method(DBUS_NAME)
def h_split_current_terminal(self):
self.guake.get_notebook().get_current_terminal().get_parent().split_h()
@dbus.service.method(DBUS_NAME, in_signature="i")
def h_split_current_terminal(self, split_percentage: int):
self.guake.get_notebook().get_current_terminal().get_parent().split_h(split_percentage)

@dbus.service.method(DBUS_NAME, in_signature="s")
def v_split_current_terminal_with_command(self, command):
self.guake.get_notebook().get_current_terminal().get_parent().split_v()
@dbus.service.method(DBUS_NAME, in_signature="si")
def v_split_current_terminal_with_command(self, command, split_percentage: int):
self.guake.get_notebook().get_current_terminal().get_parent().split_v(split_percentage)
self.guake.execute_command(command)

@dbus.service.method(DBUS_NAME, in_signature="s")
def h_split_current_terminal_with_command(self, command):
self.guake.get_notebook().get_current_terminal().get_parent().split_h()
@dbus.service.method(DBUS_NAME, in_signature="si")
def h_split_current_terminal_with_command(self, command, split_percentage: int):
self.guake.get_notebook().get_current_terminal().get_parent().split_h(split_percentage)
self.guake.execute_command(command)

@dbus.service.method(DBUS_NAME, in_signature="s", out_signature="i")
Expand Down
36 changes: 26 additions & 10 deletions guake/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,29 @@ def main():
parser.add_argument(
"--split-vertical",
dest="split_vertical",
action="store_true",
default=False,
help=_("Split the selected tab vertically."),
metavar="SPLIT_PERCENTAGE",
action="store",
type=int,
nargs="?",
const=50,
default=None,
choices=range(1, 100),
help=_("Split the selected tab vertically. Optional input split percentage for the width."),
)

parser.add_argument(
"--split-horizontal",
dest="split_horizontal",
action="store_true",
default=False,
help=_("Split the selected tab horizontally."),
metavar="SPLIT_PERCENTAGE",
action="store",
type=int,
nargs="?",
const=50,
default=None,
choices=range(1, 100),
help=_(
"Split the selected tab horizontally. Optional input split percentage for the height."
),
)

parser.add_argument(
Expand Down Expand Up @@ -553,16 +565,20 @@ def main():

if options.split_vertical:
if options.command:
remote_object.v_split_current_terminal_with_command(options.command)
remote_object.v_split_current_terminal_with_command(
options.command, options.split_vertical
)
else:
remote_object.v_split_current_terminal()
remote_object.v_split_current_terminal(options.split_vertical)
only_show_hide = options.show

if options.split_horizontal:
if options.command:
remote_object.h_split_current_terminal_with_command(options.command)
remote_object.h_split_current_terminal_with_command(
options.command, options.split_horizontal
)
else:
remote_object.h_split_current_terminal()
remote_object.h_split_current_terminal(options.split_horizontal)
only_show_hide = options.show

if options.selected_terminal:
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/command_improvement-e7fcdf2a28c0e488.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
release_summary: >
Improved terminal splitting: Optional specified percentage now reflects the new pane's size when using --split-vertical or --split-horizontal.

features:
- |
- Allow splitting terminal to specific size with --split-vertical <Size> or --split-horizontal <Size> #1931
3 changes: 1 addition & 2 deletions releasenotes/notes/save_zoom-8b8f54485b975e7c.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ release_summary: >

fixes:
- |
- Opening a new tab resets the zoom level/ #2109

- Opening a new tab resets the zoom level/ #2109
Loading