Commit 21e637d9 authored by rocosen's avatar rocosen

fix:bug

parent af9143ae
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
...@@ -40,12 +40,7 @@ const getAssetPath = (...paths: string[]): string => { ...@@ -40,12 +40,7 @@ const getAssetPath = (...paths: string[]): string => {
return path.join(RESOURCES_PATH, ...paths); return path.join(RESOURCES_PATH, ...paths);
}; };
let image = nativeImage.createFromPath(getAssetPath('icon.jpg')); let image = nativeImage.createFromPath(getAssetPath('/img/iconTemplate.png'));
image = image.resize({
width: 32,
height: 32,
});
Menu.setApplicationMenu(null); Menu.setApplicationMenu(null);
...@@ -165,7 +160,7 @@ const createWindow = async () => { ...@@ -165,7 +160,7 @@ const createWindow = async () => {
}, },
}); });
tray = new Tray(image); tray = new Tray(await image);
// tray.setTitle('test'); // tray.setTitle('test');
mainWindow.loadURL(resolveHtmlPath('index.html')); mainWindow.loadURL(resolveHtmlPath('index.html'));
......
...@@ -41,6 +41,14 @@ button:hover { ...@@ -41,6 +41,14 @@ button:hover {
opacity: 1; opacity: 1;
} }
input {
-webkit-app-region: no-drag;
}
label {
-webkit-app-region: no-drag;
}
li { li {
list-style: none; list-style: none;
} }
......
...@@ -152,7 +152,8 @@ export default (props) => { ...@@ -152,7 +152,8 @@ export default (props) => {
const scrollEvent = (e) => { const scrollEvent = (e) => {
if ( if (
e.target.clientHeight + e.target.scrollTop === e.target.clientHeight + e.target.scrollTop ===
e.target.scrollHeight - 0.5 e.target.scrollHeight - 0.5 ||
e.target.clientHeight + e.target.scrollTop === e.target.scrollHeight
) { ) {
setPage(page + 1); setPage(page + 1);
getMessage(page + 1); getMessage(page + 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment