myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-04-09 05:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar

Browse Source
This commit is contained in:
Geomitron
2023-11-29 11:39:54 -06:00
parent 2eef4d0bee
commit 6fae59f762
5 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src-angular/app/components/toolbar/toolbar.component.html
View File

@@ -1,15 +1,19 @@
<div class="navbar bg-base-100">
<button class="btn btn-square btn-ghost" routerLinkActive="active" routerLink="/browse">Browse</button>
<!-- TODO <a class="item" routerLinkActive="active" routerLink="/library">Library</a> -->
<button class="btn btn-square btn-ghost" routerLinkActive="active" routerLink="/settings">
<i *ngIf="updateAvailable" class="teal small circle icon"></i>
<i *ngIf="updateAvailable === null" class="small yellow exclamation triangle icon"></i>
Settings
</button>
<div class="right menu">
<a class="item traffic-light" (click)="minimize()"><i class="bi bi-dash-lg"></i></a>
<a class="item traffic-light" (click)="toggleMaximized()"><i class="bi" [ngClass]="isMaximized ? 'bi-window-stack' : 'bi-window'"></i></a>
<a class="item traffic-light close" (click)="close()"><i class="bi bi-x"></i></a>
<div class="navbar p-0 min-h-0 bg-base-100" style="-webkit-app-region: drag">
<div style="-webkit-app-region: no-drag">
<button class="btn btn-square btn-ghost rounded-none px-14 cursor-default" routerLinkActive="btn-active" routerLink="/browse">Browse</button>
<!-- TODO <a class="btn btn-square btn-ghost rounded-none cursor-default" routerLinkActive="btn-active" routerLink="/library">Library</a> -->
<button class="btn btn-square btn-ghost rounded-none px-12 cursor-default" routerLinkActive="btn-active" routerLink="/settings">
<i *ngIf="updateAvailable" class="teal small circle icon"></i>
<i *ngIf="updateAvailable === null" class="small yellow exclamation triangle icon"></i>
Settings
</button>
</div>
<div class="flex-1"></div>
<div style="-webkit-app-region: no-drag">
<button class="btn btn-square btn-ghost rounded-none cursor-default" (click)="minimize()"><i class="bi bi-dash-lg"></i></button>
<button class="btn btn-square btn-ghost rounded-none cursor-default" (click)="toggleMaximized()">
<i class="bi" [ngClass]="isMaximized ? 'bi-window-stack' : 'bi-window'"></i>
</button>
<button class="btn btn-square btn-ghost rounded-none hover:bg-red-600/20 cursor-default" (click)="close()"><i class="bi bi-x-lg"></i></button>
</div>
</div>

27
src-angular/app/components/toolbar/toolbar.component.scss
View File

@@ -1,27 +0,0 @@
.menu {
-webkit-app-region: drag;
z-index: 9000 !important;
border: 0px;
border-radius: 0px;
.item,
.item * {
border-radius: 0px;
-webkit-app-region: no-drag;
cursor: default !important;
}
}
.traffic-light {
&:before {
display: none !important;
}
i {
margin: 0 !important;
}
}
.close:hover {
background: rgba(255, 0, 0, .15) !important;
}

1
src-angular/app/components/toolbar/toolbar.component.ts
View File

@@ -3,7 +3,6 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
@Component({
selector: 'app-toolbar',
templateUrl: './toolbar.component.html',
styleUrls: ['./toolbar.component.scss'],
})
export class ToolbarComponent implements OnInit {

1
src-electron/main.ts
View File

@@ -131,6 +131,7 @@ async function loadWindow(retries = 0) {
try {
await mainWindow.loadURL(getLoadUrl())
} catch (err) {
console.log('FAILED TO LOAD WINDOW #', retries)
await loadWindow(retries + 1)
}
}

2
src-electron/preload.ts
View File

@@ -7,7 +7,7 @@ function getInvoker<K extends keyof IpcInvokeEvents>(key: K) {
}
function getEmitter<K extends keyof IpcToMainEmitEvents>(key: K) {
return (data: IpcToMainEmitEvents[K]) => ipcRenderer.emit(key, data)
return (data: IpcToMainEmitEvents[K]) => ipcRenderer.send(key, data)
}
function getListenerAdder<K extends keyof IpcFromMainEmitEvents>(key: K) {