feat: remove the limit of term splitting #353

hualet · 2024-08-22T14:27:37Z

a feature request from here: https://bbs.deepin.org/post/277237

github-actions · 2024-08-22T14:27:58Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

hualet · 2024-08-22T14:31:53Z

I have read the CLA Document and I hereby sign the CLA.

rb-union · 2024-08-23T02:04:29Z

/check clacheck/CLAssistant

deepin-bot · 2024-08-23T02:04:45Z

Deepin Obs Bot
Starting find obs webhook event and retrigger!

rb-union · 2024-08-23T02:11:57Z

deepin-terminal/src/views/termwidget.cpp

Line 126 in 7a69abb

 setMinimumSize(MainWindow::m_MinWidth / 2, (MainWindow::m_MinHeight - WIN_TITLE_BAR_HEIGHT) / 2); 

这里有设置最小的大小限制，小窗口下显示分屏多的话，下面的分屏终端显示会被遮盖。

BLumia · 2024-08-23T02:50:11Z

recheck

hualet · 2024-08-23T02:52:17Z

I have read the CLA Document and I hereby sign the CLA.

hualet · 2024-08-27T02:00:30Z

在中间某个term上分屏，新终端出现的位置不对
拖动分割线以后，终端分屏的尺寸不对
在无法分屏的时候（如何判断？），隐藏或者禁用分屏菜单项

a feature request from here: https://bbs.deepin.org/post/277237

fix no term gets focus after closing one, which will cause crashes if you hit Alt+Q in sequence.

original minimum size relies on the limit of one can only split the terminal once, since we removed the limits, the minimum size should change accordingly

fix the bug that new term not showing right after the old one after the splitting

fix the bug that new term has wrong size after splitting

hualet · 2024-08-30T16:07:22Z

@rb-union @ArchieMeng done!

ArchieMeng

Basically LGTM.
Additionally, a commit message is required by https://github.com/linuxdeepin/deepin-terminal/actions/runs/10635689078/job/29485856049?pr=353

src/views/termwidget.h

disable splitting menu when there's no enough room for splitting

fix shortcut still work even when there's no room for splitting

createSubSplit has side effects, it removes the term form its parent, so find size of it in QSplitter::sizes crashes.

deepin-ci-robot · 2024-09-02T15:30:35Z

deepin pr auto review

关键摘要:

在TermWidget::canSplit函数中，使用了qDebug宏，建议使用更合适的日志记录方法。
TermWidgetPage::setSplitStyle函数中，对QSplitterHandle的设置重复，可以考虑重构以减少重复代码。
TermWidgetPage::split函数中，处理splitter为nullptr的情况时，没有检查term是否为nullptr，可能会导致空指针解引用。
TermWidgetPage::closeSplit函数中，对upSplit的类型转换为QSplitter后没有检查转换结果，可能会导致运行时错误。
TermWidgetPage::closeSplit函数中，对brother的类型转换为TermWidget后没有检查转换结果，可能会导致运行时错误。
TermWidgetPage::closeSplit函数中，对nextTerm的类型转换为TermWidget后没有检查转换结果，可能会导致运行时错误。
TermWidgetPage::setCurrentTerminal函数中，直接调用setFocus可能不会按预期工作，因为setFocus可能需要在合适的上下文中调用。
TermWidgetPage::setCurrentTerminal函数中，没有处理term为nullptr的情况，可能会导致未定义行为。

是否建议立即修改:
是

ArchieMeng · 2024-09-04T05:23:29Z

src/main/mainwindow.cpp

@@ -1131,7 +1131,7 @@ inline void MainWindow::slotShortcutHorizonzalSplit()
 // 判读数量是否允许分屏
 if (Service::instance()->isCountEnable()) {
 TermWidgetPage *page = currentPage();
- if (page && CanSplit(page->currentTerminal(), Qt::Vertical)) {
+ if (page && TermWidget::canSplit(page->currentTerminal(), Qt::Vertical)) {


I meant "convert canSplit to object function". So that, the way of calling it becomes

page->currentTerminal()->canSplit(Qt::Vertical)

ArchieMeng · 2024-09-04T05:24:12Z

src/views/termwidget.cpp

@@ -1011,6 +1011,38 @@ bool TermWidget::isInRemoteServer()
 return false;
 }

+bool TermWidget::canSplit(TermWidget *term, Qt::Orientation ori) {


I meant "convert canSplit to object function".

- change CanSplit to a public funtion of TermWidget - change MIN_WIDTH and MIN_HEIGHT of TermWidget to private

ArchieMeng

+1

deepin-ci-robot · 2024-09-08T01:41:54Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ArchieMeng, hualet

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

hualet force-pushed the remove_split_count_limit branch from 23bf46b to 5516f54 Compare August 26, 2024 05:47

hualet added 4 commits August 28, 2024 18:23

feat: remove the limit of term splitting

a2faa42

a feature request from here: https://bbs.deepin.org/post/277237

fix: no term gets focus after closing one

aca7f98

fix no term gets focus after closing one, which will cause crashes if you hit Alt+Q in sequence.

fix: change minimum size set on TermWidget

ef451de

original minimum size relies on the limit of one can only split the terminal once, since we removed the limits, the minimum size should change accordingly

fix: new term not showing in the right position

7dc5ab4

fix the bug that new term not showing right after the old one after the splitting

hualet force-pushed the remove_split_count_limit branch from 5516f54 to 6d03e2c Compare August 29, 2024 16:07

fix: new term resized wrongly

eee66bc

fix the bug that new term has wrong size after splitting

hualet force-pushed the remove_split_count_limit branch from 6d03e2c to eee66bc Compare August 29, 2024 16:10

ArchieMeng requested changes Sep 1, 2024

View reviewed changes

src/views/termwidget.h Outdated Show resolved Hide resolved

src/views/termwidget.h Outdated Show resolved Hide resolved

hualet added 3 commits September 2, 2024 23:16

fix: disable splitting menu if there's no room

69cc00a

disable splitting menu when there's no enough room for splitting

fix: shortcut can still do splitting on room left

85a2d92

fix shortcut still work even when there's no room for splitting

fix: crash of unfound size

a72aac8

createSubSplit has side effects, it removes the term form its parent, so find size of it in QSplitter::sizes crashes.

hualet force-pushed the remove_split_count_limit branch from 12de9a0 to f7d6de1 Compare September 2, 2024 15:30

ArchieMeng requested changes Sep 4, 2024

View reviewed changes

chore: some code refactory

084e086

- change CanSplit to a public funtion of TermWidget - change MIN_WIDTH and MIN_HEIGHT of TermWidget to private

ArchieMeng force-pushed the remove_split_count_limit branch from f7d6de1 to 084e086 Compare September 8, 2024 01:29

ArchieMeng approved these changes Sep 8, 2024

View reviewed changes

ArchieMeng merged commit 0a71657 into linuxdeepin:master Sep 8, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: remove the limit of term splitting #353

feat: remove the limit of term splitting #353

hualet commented Aug 22, 2024

github-actions bot commented Aug 22, 2024 •

edited

Loading

hualet commented Aug 22, 2024

rb-union commented Aug 23, 2024

deepin-bot bot commented Aug 23, 2024

rb-union commented Aug 23, 2024 •

edited

Loading

BLumia commented Aug 23, 2024

hualet commented Aug 23, 2024

hualet commented Aug 27, 2024 •

edited

Loading

hualet commented Aug 30, 2024

ArchieMeng left a comment

deepin-ci-robot commented Sep 2, 2024

ArchieMeng Sep 4, 2024

ArchieMeng Sep 4, 2024

ArchieMeng left a comment

deepin-ci-robot commented Sep 8, 2024

feat: remove the limit of term splitting #353

feat: remove the limit of term splitting #353

Conversation

hualet commented Aug 22, 2024

github-actions bot commented Aug 22, 2024 • edited Loading

hualet commented Aug 22, 2024

rb-union commented Aug 23, 2024

deepin-bot bot commented Aug 23, 2024

rb-union commented Aug 23, 2024 • edited Loading

BLumia commented Aug 23, 2024

hualet commented Aug 23, 2024

hualet commented Aug 27, 2024 • edited Loading

hualet commented Aug 30, 2024

ArchieMeng left a comment

Choose a reason for hiding this comment

deepin-ci-robot commented Sep 2, 2024

deepin pr auto review

ArchieMeng Sep 4, 2024

Choose a reason for hiding this comment

ArchieMeng Sep 4, 2024

Choose a reason for hiding this comment

ArchieMeng left a comment

Choose a reason for hiding this comment

deepin-ci-robot commented Sep 8, 2024

github-actions bot commented Aug 22, 2024 •

edited

Loading

rb-union commented Aug 23, 2024 •

edited

Loading

hualet commented Aug 27, 2024 •

edited

Loading