hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Restore linux native view

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2021-12-09 13:43:56 +03:00
parent 1e459dc501
commit d1ac212143
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/window-manager.ts
View File

@ -86,6 +86,7 @@ export class WindowManager extends Singleton {
minWidth: 700, // accommodate 800 x 600 display minimum minWidth: 700, // accommodate 800 x 600 display minimum
minHeight: 500, // accommodate 800 x 600 display minimum minHeight: 500, // accommodate 800 x 600 display minimum
titleBarStyle: isWindows ? "hidden" : "hiddenInset", titleBarStyle: isWindows ? "hidden" : "hiddenInset",
autoHideMenuBar: true,
backgroundColor: "#1e2124", backgroundColor: "#1e2124",
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,

8
src/renderer/components/layout/__tests__/topbar-linux.test.tsx
View File

@ -47,13 +47,7 @@ describe("<Tobar/> in Linux", () => {
TopBarRegistry.resetInstance(); TopBarRegistry.resetInstance();
}); });
it("shows menu icon", () => { it("doesn't show custom title buttons used in Windows", () => {
const { getByTestId } = render(<TopBar/>);
expect(getByTestId("window-menu")).toBeInTheDocument();
});
it("doesn't show windows title buttons", () => {
const { queryByTestId } = render(<TopBar/>); const { queryByTestId } = render(<TopBar/>);
expect(queryByTestId("window-minimize")).not.toBeInTheDocument(); expect(queryByTestId("window-minimize")).not.toBeInTheDocument();

4
src/renderer/components/layout/topbar.module.css
View File

@ -33,6 +33,10 @@
-webkit-app-region: drag; -webkit-app-region: drag;
} }
:global(.is-mac) .topBar {
padding-left: var(--hotbar-width);
}
.winMenu { .winMenu {
width: var(--hotbar-width); width: var(--hotbar-width);

10
src/renderer/components/layout/topbar.tsx
View File

@ -31,7 +31,7 @@ import { watchHistoryState } from "../../remote-helpers/history-updater";
import { isActiveRoute, navigate } from "../../navigation"; import { isActiveRoute, navigate } from "../../navigation";
import { catalogRoute, catalogURL } from "../../../common/routes"; import { catalogRoute, catalogURL } from "../../../common/routes";
import { IpcMainWindowEvents } from "../../../main/window-manager"; import { IpcMainWindowEvents } from "../../../main/window-manager";
import { isLinux, isWindows } from "../../../common/vars"; import { isWindows } from "../../../common/vars";
interface Props extends React.HTMLAttributes<any> { interface Props extends React.HTMLAttributes<any> {
} }
@ -125,13 +125,13 @@ export const TopBar = observer(({ children, ...rest }: Props) => {
return ( return (
<div className={styles.topBar} onDoubleClick={windowSizeToggle} ref={elem} {...rest}> <div className={styles.topBar} onDoubleClick={windowSizeToggle} ref={elem} {...rest}>
<div className={styles.tools}> <div className={styles.tools}>
<div className={styles.winMenu}> {isWindows && (
{(isWindows || isLinux) && ( <div className={styles.winMenu}>
<div onClick={openContextMenu} data-testid="window-menu"> <div onClick={openContextMenu} data-testid="window-menu">
<svg width="12" height="12" viewBox="0 0 12 12" shapeRendering="crispEdges"><path fill="currentColor" d="M0,8.5h12v1H0V8.5z"/><path fill="currentColor" d="M0,5.5h12v1H0V5.5z"/><path fill="currentColor" d="M0,2.5h12v1H0V2.5z"/></svg> <svg width="12" height="12" viewBox="0 0 12 12" shapeRendering="crispEdges"><path fill="currentColor" d="M0,8.5h12v1H0V8.5z"/><path fill="currentColor" d="M0,5.5h12v1H0V5.5z"/><path fill="currentColor" d="M0,2.5h12v1H0V2.5z"/></svg>
</div> </div>
)} </div>
</div> )}
<Icon <Icon
data-testid="home-button" data-testid="home-button"
material="home" material="home"