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

Tab reordering #192

Merged
merged 12 commits into from Sep 14, 2022
Merged

Conversation

KaiTheRedNinja
Copy link
Contributor

@KaiTheRedNinja KaiTheRedNinja commented Sep 11, 2022

Description

Credit to Lingxi Li for most of the tab reordering code.

  1. Added tab reordering
  2. Fixed the bug where tabs would sometimes not show up

However, this PR has a few bugs.

  1. Dragging has that weird effect where the cursor flickers between the text input cursor and the normal cursor
  2. When dragging a file tab, the tab contents will get selected

@wdg also may need to do some modifications to WelcomeView, as currently tabContents only allows for a single tab's view to be loaded at a time, meaning that every time tabs are switched, the content in the old tab is erased. I'll make a bug report for that later.

Related Issue

Checklist

  • Fix performance issues with opening new tabs (async stuff everywhere)
  • I read and understood the contributing guide as well as the code of conduct
  • My changes generate no new warnings
  • My code builds and runs on my machine
  • I documented my code
  • Review requested

Screenshots

@codeclimate
Copy link

codeclimate bot commented Sep 11, 2022

Code Climate has analyzed commit 0974f6c and detected 0 issues on this pull request.

View more on Code Climate.

@KaiTheRedNinja KaiTheRedNinja marked this pull request as draft September 11, 2022 07:14
@KaiTheRedNinja KaiTheRedNinja marked this pull request as ready for review September 12, 2022 09:55
@nanashili
Copy link
Member

UI Issues with overlapping:
Screenshot 2022-09-12 at 12 01 18

@nanashili
Copy link
Member

Also the project navigator keeps collapsing

Screen.Recording.2022-09-12.at.12.04.13.mov

@0xWDG 0xWDG added the enhancement New feature or request label Sep 12, 2022
@0xWDG 0xWDG added this to the Version 1.0 milestone Sep 12, 2022
@nanashili
Copy link
Member

It also highlights the opened file when dragging a tab

@0xWDG 0xWDG added the UI Related to User Interface label Sep 12, 2022
@KaiTheRedNinja
Copy link
Contributor Author

It also highlights the opened file when dragging a tab

It did this even before the changes, if you dragged in the tab bar area it would select the text. I think this is a STTextView issue.

@nanashili
Copy link
Member

It also highlights the opened file when dragging a tab

It did this even before the changes, if you dragged in the tab bar area it would select the text. I think this is a STTextView issue.

Doubt it, because CE uses the same text view as us

@@ -58,9 +58,8 @@ public extension FileSystemClient {
source.resume()
self.watcher = source

// reindex the current item, because the files in the item may have changed
// TODO: reindex the current item, because the files in the item may have changed
// since the initial load on startup.
Copy link
Member

Choose a reason for hiding this comment

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

did you remove fileSystemClient?.reloadFromWatcher(sourceFileItem: self) intentionally?

Copy link
Member

Choose a reason for hiding this comment

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

It caused folders to collapse so I think he removed it for that reason

0xWDG
0xWDG previously approved these changes Sep 13, 2022
@0xWDG
Copy link
Member

0xWDG commented Sep 13, 2022

It also highlights the opened file when dragging a tab

It did this even before the changes, if you dragged in the tab bar area it would select the text. I think this is a STTextView issue.

Doubt it, because CE uses the same text view as us

We use it in an completely different way, so it can be different. still no problem.

@KaiTheRedNinja Create a issue for the highlighting, and mention it in this PR, then we can merge it. its not breaking, only annoying.

@KaiTheRedNinja
Copy link
Contributor Author

Once the tests finish I'll merge this. I've already reported the weird bug with text selection.

@KaiTheRedNinja KaiTheRedNinja merged commit e034943 into AuroraEditor:main Sep 14, 2022
@KaiTheRedNinja KaiTheRedNinja deleted the tab-reordering branch September 14, 2022 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request UI Related to User Interface
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants