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.

Sign up for GitHub

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

Jump to bottom

Remove JS from titlebar #169866

Merged
merged 7 commits into from Dec 28, 2022
Merged

Remove JS from titlebar #169866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5ebb65
switch to css based version of title bar
sbatten Dec 19, 2022
4b51ca7
fix pwa
sbatten Dec 19, 2022
96c03bf
fixes for macos
sbatten Dec 20, 2022
a50a756
fix windows/linux on desktop/web
sbatten Dec 21, 2022
258dc33
unused import
sbatten Dec 21, 2022
4aa47e7
macos patches
sbatten Dec 22, 2022
948dcee
Merge branch 'main' into sbatten/outdoor-mosquito
bpasero Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
179 changes: 122 additions & 57 deletions src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
View file
Open in desktop
Expand Up @@ -14,13 +14,13 @@
}

/* Root Container */
.monaco-workbench .part.titlebar>.titlebar-container {
.monaco-workbench .part.titlebar > .titlebar-container {
box-sizing: border-box;
overflow: hidden;
flex-shrink: 1;
flex-grow: 1;
align-items: center;
justify-content: center;
justify-content: space-between;
user-select: none;
-webkit-user-select: none;
display: flex;
Expand All @@ -29,31 +29,31 @@
}

/* Account for zooming */
.monaco-workbench .part.titlebar>.titlebar-container.counter-zoom {
.monaco-workbench .part.titlebar > .titlebar-container.counter-zoom {
zoom: calc(1.0 / var(--zoom-factor));
}

/* Platform specific root element */
.monaco-workbench.mac .part.titlebar>.titlebar-container {
.monaco-workbench.mac .part.titlebar > .titlebar-container {
line-height: 22px;
}

.monaco-workbench.web .part.titlebar>.titlebar-container,
.monaco-workbench.windows .part.titlebar>.titlebar-container,
.monaco-workbench.linux .part.titlebar>.titlebar-container {
.monaco-workbench.web .part.titlebar > .titlebar-container,
.monaco-workbench.windows .part.titlebar > .titlebar-container,
.monaco-workbench.linux .part.titlebar > .titlebar-container {
line-height: 22px;
justify-content: left;
}

.monaco-workbench.web.safari .part.titlebar,
.monaco-workbench.web.safari .part.titlebar>.titlebar-container {
.monaco-workbench.web.safari .part.titlebar > .titlebar-container {
/* Must be scoped to safari due to #148851 */
/* Is required in safari due to #149476 */
overflow: visible;
}

/* Draggable region */
.monaco-workbench .part.titlebar>.titlebar-container>.titlebar-drag-region {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-drag-region {
top: 0;
left: 0;
display: block;
Expand All @@ -63,8 +63,43 @@
-webkit-app-region: drag;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left,
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center,
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right {
display: flex;
height: 100%;
align-items: center;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left {
order: 0;
width: 20%;
flex-grow: 2;
justify-content: flex-start;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center {
order: 1;
width: 60%;
max-width: fit-content;
min-width: 0px;
margin: 0 10px;
/* flex-shrink: 10; */
justify-content: center;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right {
order: 2;
width: 20%;
min-width: min-content;
flex-grow: 2;
justify-content: flex-end;
}



/* Window title text */
.monaco-workbench .part.titlebar>.titlebar-container>.window-title {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title {
flex: 0 1 auto;
font-size: 12px;
overflow: hidden;
Expand All @@ -74,49 +109,50 @@
margin-right: auto;
}

.monaco-workbench.web .part.titlebar>.titlebar-container>.window-title,
.monaco-workbench.windows .part.titlebar>.titlebar-container>.window-title,
.monaco-workbench.linux .part.titlebar>.titlebar-container>.window-title {
.monaco-workbench.web .part.titlebar > .titlebar-container > .titlebar-center > .window-title,
.monaco-workbench.windows .part.titlebar > .titlebar-container > .titlebar-center > .window-title,
.monaco-workbench.linux .part.titlebar > .titlebar-container > .titlebar-center > .window-title {
cursor: default;
}

.monaco-workbench.linux .part.titlebar>.titlebar-container>.window-title {
.monaco-workbench.linux .part.titlebar > .titlebar-container > .titlebar-center > .window-title {
font-size: inherit;
/* see #55435 */
}

.monaco-workbench .part.titlebar>.titlebar-container .monaco-toolbar .action-item {
.monaco-workbench .part.titlebar > .titlebar-container .monaco-toolbar .action-item {
margin-right: 4px;
}

/* Window Title Menu */
.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center {
z-index: 2500;
padding: 0 8px;
}

/* MAC supports click event despite `drag` and therefore we don't need to clear it */
.monaco-workbench:not(.mac) .part.titlebar>.titlebar-container>.window-title>.command-center {
/* MacOS Desktop supports click event despite `drag` and therefore we don't need to clear it */
.monaco-workbench:not(.mac) .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center,
.monaco-workbench.mac.web .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center {
-webkit-app-region: no-drag;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center.hide {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center.hide {
visibility: hidden;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .action-item>.action-label {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item > .action-label {
color: var(--vscode-titleBar-foreground);
}

.monaco-workbench .part.titlebar.inactive>.titlebar-container>.window-title>.command-center .action-item>.action-label {
.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item > .action-label {
color: var(--vscode-titleBar-inactiveForeground);
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .codicon {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .codicon {
color: inherit;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .action-item.command-center {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center {
display: flex;
align-items: stretch;
color: var(--vscode-commandCenter-foreground);
Expand All @@ -133,84 +169,86 @@
max-width: 600px;
}

.monaco-workbench .part.titlebar.inactive>.titlebar-container>.window-title>.command-center .action-item.command-center {
.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center {
color: var(--vscode-titleBar-inactiveForeground);
border-color: var(--vscode-commandCenter-inactiveBorder) !important;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .action-item.command-center .search-icon {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center .search-icon {
font-size: 14px;
opacity: .8;
margin: auto 3px;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .action-item.command-center .search-label {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center .search-label {
overflow: hidden;
text-overflow: ellipsis;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-title>.command-center .action-item.command-center:HOVER {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center:HOVER {
color: var(--vscode-commandCenter-activeForeground);
background-color: var(--vscode-commandCenter-activeBackground);
border-color: var(--vscode-commandCenter-activeBorder);
}

/* Menubar */
.monaco-workbench .part.titlebar>.titlebar-container>.menubar {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .menubar {
/* move menubar above drag region as negative z-index on drag region cause greyscale AA */
z-index: 2500;
min-width: 36px;
flex-wrap: nowrap;
order: 2;
}

.monaco-workbench.web .part.titlebar>.titlebar-container>.menubar {
.monaco-workbench.web .part.titlebar > .titlebar-container > .titlebar-left > .menubar {
margin-left: 4px;
}

.monaco-workbench .part.titlebar>.titlebar-container.counter-zoom > .menubar .menubar-menu-button > .menubar-menu-items-holder.monaco-menu-container {
.monaco-workbench .part.titlebar > .titlebar-container.counter-zoom .menubar .menubar-menu-button > .menubar-menu-items-holder.monaco-menu-container {
zoom: var(--zoom-factor);
}

/* Resizer */
.monaco-workbench.windows .part.titlebar>.titlebar-container>.resizer,
.monaco-workbench.linux .part.titlebar>.titlebar-container>.resizer {
.monaco-workbench.windows .part.titlebar > .titlebar-container > .resizer,
.monaco-workbench.linux .part.titlebar > .titlebar-container > .resizer {
-webkit-app-region: no-drag;
position: absolute;
top: 0;
width: 100%;
height: 4px;
}

.monaco-workbench.windows.fullscreen .part.titlebar>.titlebar-container>.resizer,
.monaco-workbench.linux.fullscreen .part.titlebar>.titlebar-container>.resizer {
.monaco-workbench.windows.fullscreen .part.titlebar > .titlebar-container > .resizer,
.monaco-workbench.linux.fullscreen .part.titlebar > .titlebar-container > .resizer {
display: none;
}

/* App Icon */
.monaco-workbench .part.titlebar>.titlebar-container>.window-appicon {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon {
width: 35px;
height: 100%;
position: relative;
z-index: 2500;
flex-shrink: 0;
order: 1;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-appicon:not(.codicon) {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon:not(.codicon) {
background-image: url('../../../media/code-icon.svg');
background-repeat: no-repeat;
background-position: center center;
background-size: 16px;
}

.monaco-workbench .part.titlebar>.titlebar-container>.window-appicon.codicon {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon.codicon {
line-height: 30px;
}

.monaco-workbench.fullscreen .part.titlebar>.titlebar-container>.window-appicon {
.monaco-workbench.fullscreen .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon {
display: none;
}

.monaco-workbench .part.titlebar>.titlebar-container .window-appicon>.home-bar-icon-badge {
.monaco-workbench .part.titlebar > .titlebar-container .window-appicon > .home-bar-icon-badge {
position: absolute;
right: 9px;
bottom: 6px;
Expand All @@ -228,34 +266,61 @@
}

/* Window Controls (Minimize, Max/Restore, Close) */
.monaco-workbench .part.titlebar>.window-controls-container {
.monaco-workbench .part.titlebar .window-controls-container {
display: flex;
flex-grow: 0;
flex-shrink: 0;
text-align: center;
z-index: 3000;
-webkit-app-region: no-drag;
width: 0px;
height: 100%;
width: 138px;
zoom: calc(1 / var(--zoom-factor));
}

.monaco-workbench.mac .part.titlebar>.window-controls-container {
width: 70px;
/* Web WCO Sizing/Ordering */
.monaco-workbench.web .part.titlebar .titlebar-right .window-controls-container {
width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
height: env(titlebar-area-height, 35px);
}

.monaco-workbench.web .part.titlebar>.window-controls-container {
width: calc(100% - env(titlebar-area-width, 100%));
.monaco-workbench.web .part.titlebar .titlebar-left .window-controls-container {
width: env(titlebar-area-x, 0px);
height: env(titlebar-area-height, 35px);
}

.monaco-workbench.fullscreen .part.titlebar>.window-controls-container {
.monaco-workbench.web.mac .part.titlebar .titlebar-left .window-controls-container {
order: 0;
}

.monaco-workbench.web.mac .part.titlebar .titlebar-right .window-controls-container {
order: 1;
}

/* Desktop Windows/Linux Window Controls*/
.monaco-workbench:not(.web):not(.mac) .part.titlebar .window-controls-container.primary {
width: calc(138px / var(--zoom-factor, 1));
}

.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.primary {
width: 138px;
}

.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container:not(.counter-zoom) .window-controls-container * {
zoom: calc(1 / var(--zoom-factor, 1));
}

/* Desktop macOS Window Controls */
.monaco-workbench:not(.web).mac .part.titlebar .window-controls-container.primary {
width: 70px;
}

.monaco-workbench.fullscreen .part.titlebar .window-controls-container {
display: none;
background-color: transparent;
}

/* Window Control Icons */
.monaco-workbench .part.titlebar>.window-controls-container>.window-icon {
.monaco-workbench .part.titlebar .window-controls-container > .window-icon {
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -264,29 +329,29 @@
font-size: 16px;
}

.monaco-workbench .part.titlebar>.window-controls-container>.window-icon::before {
.monaco-workbench .part.titlebar .window-controls-container > .window-icon::before {
height: 16px;
line-height: 16px;
}

.monaco-workbench .part.titlebar>.window-controls-container>.window-icon:hover {
.monaco-workbench .part.titlebar .window-controls-container > .window-icon:hover {
background-color: rgba(255, 255, 255, 0.1);
}

.monaco-workbench .part.titlebar.light>.window-controls-container>.window-icon:hover {
.monaco-workbench .part.titlebar.light > .window-controls-container > .window-icon:hover {
background-color: rgba(0, 0, 0, 0.1);
}

.monaco-workbench .part.titlebar>.window-controls-container>.window-icon.window-close:hover {
.monaco-workbench .part.titlebar .window-controls-container > .window-icon.window-close:hover {
background-color: rgba(232, 17, 35, 0.9);
}

.monaco-workbench .part.titlebar>.window-controls-container .window-icon.window-close:hover {
.monaco-workbench .part.titlebar .window-controls-container .window-icon.window-close:hover {
color: white;
}

/* Layout Controls */
.monaco-workbench .part.titlebar>.titlebar-container>.layout-controls-container {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .layout-controls-container {
display: none;
padding-right: 2px;
flex-grow: 0;
Expand All @@ -300,16 +365,16 @@
min-width: 28px;
}

.monaco-workbench.mac:not(.web) .part.titlebar>.titlebar-container>.layout-controls-container {
.monaco-workbench.mac:not(.web) .part.titlebar > .titlebar-container > .titlebar-right > .layout-controls-container {
right: 8px;
}

.monaco-workbench .part.titlebar>.titlebar-container>.layout-controls-container.show-layout-control {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .layout-controls-container.show-layout-control {
display: flex;
justify-content: center;
}

.monaco-workbench .part.titlebar>.titlebar-container>.layout-controls-container .codicon {
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .layout-controls-container .codicon {
color: inherit;
}

Expand Down