Skip to content
This repository was archived by the owner on Jun 4, 2023. It is now read-only.

Commit e1e92e4

Browse files
authored
feat: webui adjustments (#562)
1 parent dfa8a80 commit e1e92e4

File tree

7 files changed

+29
-21
lines changed

7 files changed

+29
-21
lines changed

src/models/dialog-store.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ipcRenderer, remote } from 'electron';
2-
import { observable, computed } from 'mobx';
2+
import { observable, computed, makeObservable } from 'mobx';
33
import { getTheme } from '~/utils/themes';
44
import { ISettings } from '~/interfaces';
55
import { DEFAULT_SETTINGS } from '~/constants';
@@ -35,6 +35,12 @@ export class DialogStore {
3535
persistent?: boolean;
3636
} = {},
3737
) {
38+
makeObservable(this, {
39+
theme: computed,
40+
settings: observable,
41+
visible: observable,
42+
});
43+
3844
const { visibilityWrapper, hideOnBlur, persistent } = {
3945
hideOnBlur: true,
4046
visibilityWrapper: true,

src/renderer/components/GlobalNavigationDrawer/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ export const GlobalNavigationDrawer = () => {
4242
<MenuItem name="bookmarks" icon={ICON_BOOKMARKS}>
4343
Bookmarks
4444
</MenuItem>
45-
<MenuItem name="downloads" icon={ICON_DOWNLOAD}>
45+
{/* <MenuItem name="downloads" icon={ICON_DOWNLOAD}>
4646
Downloads
4747
</MenuItem>
4848
<MenuItem name="extensions" icon={ICON_EXTENSIONS}>
4949
Extensions
50-
</MenuItem>
50+
</MenuItem> */}
5151
</NavigationDrawer>
5252
);
5353
};

src/renderer/views/app/components/Tab/index.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ const onMouseEnter = (tab: ITab) => (e: React.MouseEvent<HTMLDivElement>) => {
8282

8383
const onMouseLeave = () => {
8484
store.tabs.hoveredTabId = -1;
85+
ipcRenderer.send(`hide-tab-preview-${store.windowId}`);
86+
store.tabs.canShowPreview = true;
8587
};
8688

8789
const onClick = (tab: ITab) => (e: React.MouseEvent<HTMLDivElement>) => {

src/renderer/views/app/components/Tabbar/index.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ const onTabsMouseLeave = () => {
2020
store.tabs.removedTabs = 0;
2121
store.tabs.updateTabsBounds(true);
2222
}, 300);
23-
ipcRenderer.send(`hide-tab-preview-${store.windowId}`);
24-
store.tabs.canShowPreview = true;
2523
};
2624

2725
const onAddTabClick = () => {

src/renderer/views/newtab/components/App/index.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default observer(() => {
7979
icon={ICON_BOOKMARKS}
8080
onClick={onIconClick('bookmarks')}
8181
></IconItem>
82-
<IconItem
82+
{/* <IconItem
8383
imageSet={store.imageVisible}
8484
title="Downloads"
8585
icon={ICON_DOWNLOAD}
@@ -90,15 +90,15 @@ export default observer(() => {
9090
title="Extensions"
9191
icon={ICON_EXTENSIONS}
9292
onClick={onIconClick('extensions')}
93-
></IconItem>
93+
></IconItem> */}
9494
</Menu>
9595
)}
9696
</Wrapper>
97-
{store.newsBehavior !== 'hidden' && (
97+
{/* {store.newsBehavior !== 'hidden' && (
9898
<Content>
9999
<News></News>
100100
</Content>
101-
)}
101+
)} */}
102102
</div>
103103
</ThemeProvider>
104104
);

src/renderer/views/newtab/components/Preferences/index.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ export const Preferences = observer(() => {
110110
>
111111
Inspirational
112112
</ContextMenuItem>
113-
<ContextMenuItem
113+
{/* <ContextMenuItem
114114
bigger
115115
onClick={onPresetClick('informational')}
116116
selected={store.preset === 'informational'}
117117
iconSize={28}
118118
icon={ICON_WINDOW}
119119
>
120120
Informational
121-
</ContextMenuItem>
121+
</ContextMenuItem> */}
122122
<ContextMenuItem
123123
bigger
124124
selected={store.preset === 'custom'}
@@ -137,7 +137,8 @@ export const Preferences = observer(() => {
137137
pointerEvents:
138138
store.preferencesContent === 'custom' ? 'inherit' : 'none',
139139
transition: '0.3s max-height, 0.3s transform, 0.3s opacity',
140-
maxHeight: store.preferencesContent === 'custom' ? 390 : 200,
140+
// maxHeight: store.preferencesContent === 'custom' ? 390 : 200,
141+
maxHeight: store.preferencesContent === 'custom' ? 300 : 150,
141142
transform:
142143
store.preferencesContent === 'custom'
143144
? 'translateX(-100%)'
@@ -162,7 +163,7 @@ export const Preferences = observer(() => {
162163
<ContextMenuSeparator bigger></ContextMenuSeparator>
163164
<SwitchItem name="topSitesVisible">Show top sites</SwitchItem>
164165
<SwitchItem name="quickMenuVisible">Show quick menu</SwitchItem>
165-
<ContextMenuSeparator bigger></ContextMenuSeparator>
166+
{/* <ContextMenuSeparator bigger></ContextMenuSeparator>
166167
<SubTitle>News visibility:</SubTitle>
167168
<Dropdown
168169
defaultValue={store.newsBehavior}
@@ -173,7 +174,7 @@ export const Preferences = observer(() => {
173174
<Dropdown.Item value="always-visible">Always visible</Dropdown.Item>
174175
<Dropdown.Item value="hidden">Hidden</Dropdown.Item>
175176
<Dropdown.Item value="on-scroll">Visible on scroll</Dropdown.Item>
176-
</Dropdown>
177+
</Dropdown> */}
177178
</div>
178179
</div>
179180
</ContextMenu>

src/renderer/views/newtab/store/index.ts

+8-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export class Store {
3737

3838
@computed
3939
public get fullSizeImage() {
40-
return this.newsBehavior === 'on-scroll' || this.newsBehavior === 'hidden';
40+
// return this.newsBehavior === 'on-scroll' || this.newsBehavior === 'hidden';
41+
return true;
4142
}
4243

4344
@observable
@@ -169,13 +170,13 @@ export class Store {
169170

170171
this.loadTopSites();
171172

172-
window.onscroll = () => {
173-
this.updateNews();
174-
};
173+
// window.onscroll = () => {
174+
// this.updateNews();
175+
// };
175176

176-
window.onresize = () => {
177-
this.updateNews();
178-
};
177+
// window.onresize = () => {
178+
// this.updateNews();
179+
// };
179180
}
180181

181182
public async loadImage() {

0 commit comments

Comments
 (0)