From a83479f46f068c95fe8dbb04f4adc2fd60402e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=A9=E8=BF=9C?= Date: Fri, 5 Jun 2020 10:05:54 +0800 Subject: [PATCH] use modified dependencies --- dist/icons/fabric-icons-2-63c99abf.woff | Bin 0 -> 12596 bytes dist/styles.css | 8 +++- package.json | 2 +- src/components/menu.tsx | 6 +-- src/components/nav.tsx | 50 ++++++++++++++++++++---- src/components/settings/proxy.tsx | 2 +- src/electron.ts | 11 +----- src/scripts/models/item.ts | 2 +- src/scripts/models/source.ts | 2 +- src/scripts/utils.ts | 2 +- 10 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 dist/icons/fabric-icons-2-63c99abf.woff diff --git a/dist/icons/fabric-icons-2-63c99abf.woff b/dist/icons/fabric-icons-2-63c99abf.woff new file mode 100644 index 0000000000000000000000000000000000000000..88295a59299ca2bdfaab0ed2fb0eb0d2234f63aa GIT binary patch literal 12596 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 literal 0 HcmV?d00001 diff --git a/dist/styles.css b/dist/styles.css index 48437d4..bba77a1 100644 --- a/dist/styles.css +++ b/dist/styles.css @@ -98,9 +98,15 @@ i.ms-Nav-chevron { vertical-align: top; } .btn-group .btn.system { - position: sticky; + position: relative; z-index: 10; } +nav.hide-btns .btn-group .btn { + display: none; +} +nav.hide-btns .btn-group .btn.system { + display: inline-block; +} .btn-group .btn:hover { background-color: #0001; } diff --git a/package.json b/package.json index e32dfd9..5d6d14d 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@types/redux-thunk": "^2.1.0", "@types/reselect": "^2.2.0", "@yang991178/electron-proxy-agent": "^1.2.1", + "@yang991178/rss-parser": "^3.8.1", "electron": "^8.3.0", "electron-react-devtools": "^0.5.3", "electron-window-state": "^5.0.3", @@ -35,7 +36,6 @@ "redux-devtools": "^3.5.0", "redux-thunk": "^2.3.0", "reselect": "^4.0.0", - "rss-parser": "^3.8.0", "ts-loader": "^7.0.4", "typescript": "^3.9.2", "webpack": "^4.43.0", diff --git a/src/components/menu.tsx b/src/components/menu.tsx index faefac7..aaeab88 100644 --- a/src/components/menu.tsx +++ b/src/components/menu.tsx @@ -23,9 +23,9 @@ export class Menu extends React.Component { { links: [ { - name: "主页", - key: "home", - icon: "Home", + name: "搜索", + key: "search", + icon: "Search", url: null }, { diff --git a/src/components/nav.tsx b/src/components/nav.tsx index 101004c..c9636cb 100644 --- a/src/components/nav.tsx +++ b/src/components/nav.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { ipcRenderer } from "electron" +import { ipcRenderer, remote } from "electron" import { Icon } from "@fluentui/react/lib/Icon" import { AppState, MenuStatus } from "../scripts/models/app" import { NavReduxProps } from "../containers/nav-container" @@ -12,14 +12,46 @@ type NavProps = NavReduxProps & { settings: () => void } -class Nav extends React.Component { - ipcSend(message:string) { - ipcRenderer.send(message) +type NavState = { + maximized: boolean, + window: Electron.BrowserWindow +} + +class Nav extends React.Component { + constructor(props) { + super(props) + let window = remote.getCurrentWindow() + window.on("maximize", () => { + this.setState({ maximized: true }) + }) + window.on("unmaximize", () => { + this.setState({ maximized: false }) + }) + this.state = { + maximized: remote.getCurrentWindow().isMaximized(), + window: window + } + } + + minimize = () => { + this.state.window.minimize() + } + maximize = () => { + if (this.state.maximized) { + this.state.window.unmaximize() + } else { + this.state.window.maximize() + } + this.setState({ maximized: !this.state.maximized }) + } + close = () => { + this.state.window.close() } canFetch = () => this.props.state.sourceInit && this.props.state.feedInit && !this.props.state.fetchingItems fetching = () => !this.canFetch() ? " fetching" : "" menuOn = () => this.props.state.menu == MenuStatus.Open ? " on" : "" + hideButtons = () => (this.props.state.menu == MenuStatus.Open || this.props.state.settings.display) ? "hide-btns" : "" fetch = () => { if (this.canFetch()) this.props.fetch() @@ -27,7 +59,7 @@ class Nav extends React.Component { render() { return ( -