diff --git a/src/components/common/Mini/MiniLogger.tsx b/src/components/common/Mini/MiniLogger.tsx index c5f97a2..d8017f9 100644 --- a/src/components/common/Mini/MiniLogger.tsx +++ b/src/components/common/Mini/MiniLogger.tsx @@ -241,7 +241,7 @@ export class MiniLogger extends React.Component { fontSize="40" style={{ fill: 'rgb(99,99,99)' }} > - {isConfirming ? '🍅' : time} + {isConfirming ? (isFocusing ? '🍅' : '') : time} {this.getButtonRow()} diff --git a/src/main/init.ts b/src/main/init.ts index 0ff2a61..88be00f 100644 --- a/src/main/init.ts +++ b/src/main/init.ts @@ -50,7 +50,7 @@ const createWindow = async () => { width: 1080, height: 800, minWidth: 380, - minHeight: 80, + minHeight: 63, frame: true, icon: nativeImage.createFromPath(path.join(__dirname, logo)), title: 'Pomodoro Logger', diff --git a/src/renderer/components/Application.tsx b/src/renderer/components/Application.tsx index 69b2cbe..84a0bc4 100644 --- a/src/renderer/components/Application.tsx +++ b/src/renderer/components/Application.tsx @@ -33,7 +33,7 @@ const Main = styled.div` margin: 0; } - ${({ minimize }) => (minimize ? 'overflow: hidden;' : '')} + ${({ minimize }) => (minimize ? 'overflow: hidden; height: 100vh;' : '')} .ant-tabs-nav-container,.ant-modal-content { ${({ minimize }) => (minimize ? 'display: none;' : '')} } diff --git a/src/renderer/components/Timer/action.ts b/src/renderer/components/Timer/action.ts index 11094ca..30a580d 100644 --- a/src/renderer/components/Timer/action.ts +++ b/src/renderer/components/Timer/action.ts @@ -237,7 +237,11 @@ export const actions = { const win = remote.getCurrentWindow(); win.setAlwaysOnTop(mini); if (mini) { - win.setBounds({ height: 80, width: 366 }); + if (process.platform !== 'darwin') { + win.setBounds({ height: 80, width: 366 }); + } else { + win.setBounds({ height: 63, width: 366 }); + } } else { win.setBounds({ height: 800, width: 1080 }); }