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

merging menu/titlebar #55100

Merged
merged 6 commits into from
Jul 27, 2018
Merged

merging menu/titlebar #55100

merged 6 commits into from
Jul 27, 2018

Conversation

sbatten
Copy link
Member

@sbatten sbatten commented Jul 26, 2018

mainly refs #53244
also refs #53252 #52920 #17180 #54575 #52954 #52952

@sbatten sbatten self-assigned this Jul 26, 2018
@@ -14,7 +14,6 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
Copy link
Contributor

Choose a reason for hiding this comment

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

Changes in this file make sense. You are using titlebarheight instead of headingHeight since we are mergin now these elements.

@@ -106,15 +106,7 @@ export class MenubarPart extends Part {
private _modifierKeyStatus: IModifierKeyStatus;
Copy link
Contributor

Choose a reason for hiding this comment

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

Changes in this file make sense, mostly simplification and updating of css rules.

@@ -6,7 +6,6 @@
.monaco-workbench > .part.titlebar {
Copy link
Contributor

Choose a reason for hiding this comment

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

Getting rid of order makes sense, but all these css changes would be best to tryout and not review imho.

@@ -32,7 +32,8 @@ import URI from 'vs/base/common/uri';
import { Color } from 'vs/base/common/color';
Copy link
Contributor

Choose a reason for hiding this comment

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

You own this area and I leave this changes up to you.
Overall looks ok.

@@ -30,7 +30,6 @@ import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense, we are removing the menu bar part.

@isidorn
Copy link
Contributor

isidorn commented Jul 26, 2018

@sbatten I looked at the changes and they look good overall.
Both Joao and Ben are on vacation so I would not expect them to review this this or next week.

I tested this out on mac and it does not work, starting the workbench only shows three menus and clicking on the File does no actions.
On linux if I use the "custom" menu then there is no menu at all.

Is the plan to merge this in this milestone? If yes then I would expect you to test this out on all platforms and once it works let me know so I can also test it out and then we can merge it in. After that we would create some detailed test plan items and so on.

screen shot 2018-07-26 at 10 56 32

screen shot 2018-07-26 at 11 10 34

@isidorn isidorn self-assigned this Jul 26, 2018
@sbatten
Copy link
Member Author

sbatten commented Jul 26, 2018

@isidorn yes, the plan is to do this, this milestone. I discovered the issue yesterday about it not working on macOS. I will fix these and test them as you suggest. I'll let you know when ready for further testing. Thanks!

@sbatten
Copy link
Member Author

sbatten commented Jul 27, 2018

@isidorn should be working on all platforms now

@isidorn
Copy link
Contributor

isidorn commented Jul 27, 2018

Tried it on mac and linux and this work fine now. I believe you thouroughly tested on windows.
Feel free to merge.

@isidorn isidorn added this to the July 2018 milestone Jul 27, 2018
@bpasero
Copy link
Member

bpasero commented Aug 6, 2018

@sbatten I like it, filed #55859 as little follow up.

I notice that we still seem to hardcode some menus in the src/vs/code/electron-main/menubar.ts file (e.g. Terminal). What is the reason behind that, can we get rid of that and purely rely on the contributions?

@sbatten
Copy link
Member Author

sbatten commented Aug 7, 2018

@bpasero the menu is populated by contributions, or do you mean having the menu at a top-level should be based on contributions?

@bpasero
Copy link
Member

bpasero commented Aug 8, 2018

@sbatten I see the issue, so basically the top level entries are hardcoded because we have no contribution story for those?

@sbatten
Copy link
Member Author

sbatten commented Aug 8, 2018

@bpasero right, they just exist and can be contributed to. but I believe the menubar in the render process can be responsible for aggregating and ordering to keep it in one place

@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants