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

Resize terminal direction #205015

Merged
merged 7 commits into from Feb 27, 2024
Merged

Resize terminal direction #205015

merged 7 commits into from Feb 27, 2024

Conversation

cchanche
Copy link
Contributor

Fixes #204458

Clashes a bit with the fix from #200658 , which seems to have broken thing in the first place.

@cchanche
Copy link
Contributor Author

cchanche commented Feb 13, 2024

So after reading about the difference between the Panel and the Sidebars from @Tyriar in #204458 (comment), I identified that terminals positioned in the primary sidebar (on the left) were having the same bug (resizing right had the same behaviour as resizing left - probably because of my original fix but i'm not sure).

The above commit accounts for that, and every terminal-position now seems to have a natural resizing behaviour.

Code seems to invert the resize directions in multiple places, and I couldn't figure out an elegant way to do it once with clear variable names. However, the following testing method ensures the proposed fix actually fixes the issue 👇

The testing method is as follows :

  • Open Code - OSS
  • Open a terminal (Terminal: Create New Terminal)
  • Open a split terminal (Terminal: Split Terminal)
  • Make sure panel is bot (View: Move Panel To Bottom)

The terminal should be visible, should be splitted (two actual terminals), be opened in the Panel (not in any sidebar), and the panel is positionned in the bottom

  • Focus in the first terminal (the one on the left)

  • Terminal: Resize Terminal Right grows the split-terminal's width to the right, panel keeps the same size

  • Terminal: Resize Terminal Left shrinks the split-terminal's width to the left, panel keeps the same size

  • Terminal: Resize Terminal Up grows the panel's height, split-terminals keep the same width

  • Terminal: Resize Terminal Down shrinks the panel's height, split-terminals keep the same width

  • Focus in the second terminal (the one on the right)

  • Terminal: Resize Terminal Right shrinks the split-terminal's width to the right, panel keeps the same size

  • Terminal: Resize Terminal Left grows the split-terminal's width to the left, panel keeps the same size

  • Terminal: Resize Terminal Up grows the panel's height, split-terminals keep the same width

  • Terminal: Resize Terminal Down shrinks the panel's height, split-terminals keep the same width

  • Move panel to the right (View: Move Panel Right)

  • Terminal: Resize Terminal Right shrinks the panel's width to the right, split-terminals keep the same height

  • Terminal: Resize Terminal Left grows the panel's width, split-terminals keep the same height

  • Terminal: Resize Terminal Up grows the bottom-terminal's height, shrinks the top-terminal's height, and keeps the panels width

  • Terminal: Resize Terminal Down shrinks the bottom-terminal's height, grows the top-terminal's height, and keeps the panel's width

  • Move panel to the left (View: Move Panel Left)

  • Repeat the above steps, all resize directions should be natural (meaning panels or terminal edges should move in the direction stated by the command, and grow/shrink the corresponding pane)

  • Now move the terminal to the secondary-sidebar (Move Panel Views to the Secondary Sidebar or drag & drop the terminal to the secondary (right) sidebar)

  • Repeat the above steps

  • Now move the terminal tab from the secondary sidebar to the main sidebar on the right (couldn't find a command for this)

  • Repeat the above steps

  • Run Create new Terminal in the Editor Area to the Side

  • Repeat the above steps (⚠️ not sure about this, but Terminal: Resize [ direction ] commands don't act natural here

@Tyriar Tyriar added this to the March 2024 milestone Feb 26, 2024
@Tyriar Tyriar self-assigned this Feb 26, 2024
Copy link
Member

@Tyriar Tyriar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the behavior of the primary side bar when on the right is inverse with this PR. In this state:

image

@cchanche
Copy link
Contributor Author

Looks like the behavior of the primary side bar when on the right is inverse with this PR. In this state:

Oh you are right, didn't know the sidebars could be repositioned too (not just the panel). I'll look into this, thank you !

@cchanche please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@cchanche
Copy link
Contributor Author

@microsoft-github-policy-service agree

@cchanche
Copy link
Contributor Author

Alright so I think I've now covered every scenario.

Add the Move Sidebar Left command to the above testing scenarios

Also, I moved a few things around so that it would all make more sense (at least to me) :

  • If required, resizing the whole part (panel or sidebars) is now entirely under the responsibility of TerminalGroup class.

  • Resizing individual terminals (when in split-mode, children > 1), when required, is still handled by the SplitPaneContainer class.

  • Deciding whether to resize the whole part or just individual terminals within the part (shouldResizePart) is made using _getPosition() and _getOrientation() methods on the TerminalGroup class.

  • For the resize to happen in the same direction as the one passed in the resizePane() method, I used a shouldShrink condition - since in the end it is all about what the new part's size should be.

Copy link
Member

@Tyriar Tyriar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great! Thanks for the follow up 👍

@Tyriar Tyriar merged commit 915a08f into microsoft:main Feb 27, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resize terminal right shortcut broken
4 participants