Skip to content

Commit c339d95

Browse files
conaticusEx-ce-ptVirusBLITZImKventisAltF02
authored
Major bug fixes (#47)
* Merge main tweaks into dev (#46) * Added graphs & cleaned Con's code (#29) * Pagination (#8) * test commit * tab is now 2 spaces in every file * pagination * added some more components * routing using `<svelte:component>` * Routing (#9) * test commit * tab is now 2 spaces in every file * pagination * added some more components * routing using `<svelte:component>` * Add Load Game page (save overview) (#10) * change bulde identifier to allow building for prod * sync * switch border radius to rem and create variable * use-select: none by default * create center class * save game overview * added volume slider (#11) * Create desktop and shortcuts (#12) * change bulde identifier to allow building for prod * sync * switch border radius to rem and create variable * use-select: none by default * create center class * save game overview * remove max-width from #app * create desktop * create desktop shortcut * open desktop when save is clicked * show desktop in singleplayer game component * align shortcuts vertically on desktop load * setup base for prototype * add percentage utility * add percentage utility * generate person education level * code cleanup & desktop work (#13) * added volume slider * code cleanup & desktop work * isolation * window work (#14) * added volume slider * code cleanup & desktop work * isolation * window work * Window resizing (#15) * added volume slider * code cleanup & desktop work * isolation * window work * window resizing * Notifications (#16) * notifications * notifications & app state safety * Change window button appearance (#17) * change window header height to 25, remove duplicate exports * install ionicons * change window button appearance * reformat TestWindow * implement person * begin generation * begin business generation * fix percentage bug & fix exponentially high wants values * small bug fixes * Window scaling (#18) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * Revert "Window scaling (#18)" (#19) This reverts commit 426526c. * fix calculations * Window scaling (take 2) (#20) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * Apps & toolbar (#21) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * apps & taskbar * generate business employees * remove unused variables * assign people to businesses * fix error * remove unnecesary balance checking * fix errors * begin time passing features * implement monthly behaviour (broke) * fix dumb * fix memory errors * fix errors * fix mutex async issues * refactor file structure * change to rust mutex, pay employees at the end of each month * remove uneeded async * calculate random business balance when generated * Rust gameflow (#22) * setup base for prototype * add percentage utility * add percentage utility * generate person education level * implement person * begin generation * begin business generation * fix percentage bug & fix exponentially high wants values * small bug fixes * fix calculations * generate business employees * remove unused variables * assign people to businesses * fix error * remove unnecesary balance checking * fix errors * begin time passing features * implement monthly behaviour (broke) * fix dumb * fix memory errors * fix errors * fix mutex async issues * refactor file structure * change to rust mutex, pay employees at the end of each month * remove uneeded async * calculate random business balance when generated * Fix Window not unmaximising and remove parentelement property (#23) * game create event * default to desktop, create new game automatically * make fullscreen off by default (for development) * set fullscreen in tauri config (oopsie) * Toolbar icons (#24) * toolbar icons * email & gov. spending * error message * refactor code a little * deduct taxes from businesses & people each month * change tax rate to percentage decimal * fix budget allocation calculations * percentage based output float * fix oopsie * calculate marketing reach & cost, deduct that cost from business balance * prepare for next feature * clean up business.rs * seperate state manager * calculate new business market monthly * generate business owner * pay business owner * basic person debt payment * add or deduct from government balance * fix toolbar styling * start documenting rust gameflow * Basic app layouts (#25) * basic email layout * email rendering * basic budget panel * Fixing cons tabs (#26) * Fixing 2-wide tabs * More tabs * .await added * rename wants to demand * implement dates system * date event * health & hospitalisation system * rm comment * fix bugs * pregenerate the game * fix bugs & implement food spending system * forgot to replenish health after hospitalization * fix function misplacement * more bug fixing * remove dumb code for exedice * fix idx error * debugger (beginning) (#27) * use debugger * Debugger (#28) * debugger * fixed dropdown * debug population count * fix debug display * allow to debug multiple times * change government balance to u128 * healthcare improvements & bug fixes * add minuses to compactify * begin homelessness implementation * tune health system & fix bugs * Implement barebones unemployment handling NOTE: There was an LF CRLF warning in git - dunno what that means lol * use util function & fix conflict of local * start babies * forgot most important part lol * bug fixes 1 * added graph component (experimental) Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com> Co-authored-by: conaticus <enquiry.conaticus@gmail.com> Co-authored-by: Sam <72096531+conaticus@users.noreply.github.com> Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com> * Revert "Added graphs & cleaned Con's code (#29)" This reverts commit 8cb7c5b. * Prepare for Distribution (#43) * Pagination (#8) * test commit * tab is now 2 spaces in every file * pagination * added some more components * routing using `<svelte:component>` * Routing (#9) * test commit * tab is now 2 spaces in every file * pagination * added some more components * routing using `<svelte:component>` * Add Load Game page (save overview) (#10) * change bulde identifier to allow building for prod * sync * switch border radius to rem and create variable * use-select: none by default * create center class * save game overview * added volume slider (#11) * Create desktop and shortcuts (#12) * change bulde identifier to allow building for prod * sync * switch border radius to rem and create variable * use-select: none by default * create center class * save game overview * remove max-width from #app * create desktop * create desktop shortcut * open desktop when save is clicked * show desktop in singleplayer game component * align shortcuts vertically on desktop load * setup base for prototype * add percentage utility * add percentage utility * generate person education level * code cleanup & desktop work (#13) * added volume slider * code cleanup & desktop work * isolation * window work (#14) * added volume slider * code cleanup & desktop work * isolation * window work * Window resizing (#15) * added volume slider * code cleanup & desktop work * isolation * window work * window resizing * Notifications (#16) * notifications * notifications & app state safety * Change window button appearance (#17) * change window header height to 25, remove duplicate exports * install ionicons * change window button appearance * reformat TestWindow * implement person * begin generation * begin business generation * fix percentage bug & fix exponentially high wants values * small bug fixes * Window scaling (#18) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * Revert "Window scaling (#18)" (#19) This reverts commit 426526c. * fix calculations * Window scaling (take 2) (#20) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * Apps & toolbar (#21) * notifications * notifications & app state safety * window scaling * maximize-minimize toggle * apps & taskbar * generate business employees * remove unused variables * assign people to businesses * fix error * remove unnecesary balance checking * fix errors * begin time passing features * implement monthly behaviour (broke) * fix dumb * fix memory errors * fix errors * fix mutex async issues * refactor file structure * change to rust mutex, pay employees at the end of each month * remove uneeded async * calculate random business balance when generated * Rust gameflow (#22) * setup base for prototype * add percentage utility * add percentage utility * generate person education level * implement person * begin generation * begin business generation * fix percentage bug & fix exponentially high wants values * small bug fixes * fix calculations * generate business employees * remove unused variables * assign people to businesses * fix error * remove unnecesary balance checking * fix errors * begin time passing features * implement monthly behaviour (broke) * fix dumb * fix memory errors * fix errors * fix mutex async issues * refactor file structure * change to rust mutex, pay employees at the end of each month * remove uneeded async * calculate random business balance when generated * Fix Window not unmaximising and remove parentelement property (#23) * game create event * default to desktop, create new game automatically * make fullscreen off by default (for development) * set fullscreen in tauri config (oopsie) * Toolbar icons (#24) * toolbar icons * email & gov. spending * error message * refactor code a little * deduct taxes from businesses & people each month * change tax rate to percentage decimal * fix budget allocation calculations * percentage based output float * fix oopsie * calculate marketing reach & cost, deduct that cost from business balance * prepare for next feature * clean up business.rs * seperate state manager * calculate new business market monthly * generate business owner * pay business owner * basic person debt payment * add or deduct from government balance * fix toolbar styling * start documenting rust gameflow * Basic app layouts (#25) * basic email layout * email rendering * basic budget panel * Fixing cons tabs (#26) * Fixing 2-wide tabs * More tabs * .await added * rename wants to demand * implement dates system * date event * health & hospitalisation system * rm comment * fix bugs * pregenerate the game * fix bugs & implement food spending system * forgot to replenish health after hospitalization * fix function misplacement * more bug fixing * remove dumb code for exedice * fix idx error * debugger (beginning) (#27) * use debugger * Debugger (#28) * debugger * fixed dropdown * debug population count * fix debug display * allow to debug multiple times * change government balance to u128 * healthcare improvements & bug fixes * add minuses to compactify * begin homelessness implementation * tune health system & fix bugs * Implement barebones unemployment handling NOTE: There was an LF CRLF warning in git - dunno what that means lol * use util function & fix conflict of local * start babies * forgot most important part lol * bug fixes 1 * clippy cleanup * fix dates bug * health system improvements * Little change (#30) * added graph component (experimental) * little change * little cleanup of state manager * dynamic population, cleanup, bug fixes & debts system improvements * fix gov balance maxxing at 2.1billion * quick bug fix * update food spending when debt is paid off * bug fixes & new utils & debugging * calculate new hospital capacity cost when modified * add welfare system * welfare adjustments * welfare improvements & bug fixes * fix birth rate inaccuracies * fix mass deaths at game start bug & make homelessness possible mid game * calculate demand every month * improve purchase days system & welfare * big update - start dynamic employees, bug fixes, switch to uuid (broken) * i fixed the fucking bug i fixed the fucking bug omg i fixed the fuckign bug * eliminate potential idx conflicts * fix business flow (incomplete) * so many bugs to fix * switch to hashmaps for performance * new market optimisations * Brand new UI (designed by LemonOrange) (#31) * removed icons * removed icons (fr this time) * basic structure * fix window drag area * packed window events into one event * constants * styling * fixed wallpaper * window structure & styling * uninstalled svelte-ionicons * fix window resizing * finally made the code structure better * fix window minimizing * improve resize bars * fixed resize bars' pos & size * fix app position * opening apps * change duration to secs * fix early game crash * Minor frontend changes (#32) * frontend bugs fixed * minimize app if not minimized * alt+f4 * eliviate day pass error * fix salary & tax bug * it's always the divides that get me (fix major bug) * Email styling (#33) * opened app always focused * styling #1 * email header * improve email header * line counter * constrained the line numbers * tiny changes * non-critical window events * fix email text overflow bug * add game generated event * Loading screen (#34) * loading screen * can minimize apps from apps' list * loading screen fix * rust receive frontend ready event * Send frontend_ready event (#35) * send frontend_ready event * remove async * business balancing & fix linux selection * Frontend bugs (#36) * right border disappears * line counter doesn't extend all the way * cursor doesn't change when dragging windows * last checked date incorrect * badge count doesn't reset * window doesn't maximize when on top * it fucking works * thanks matt <3 * reset game event for frontend (unimplemented) * separate business & person tax rates * implement person & business tax rules * add business funding rule * Frontend functionality #1 (#37) * correct cursor in email * note * loading screen * create game on desktop mount * rust app open and app close handlers * match enum to array indexes * add generation events * Frontend functionality (2) (#38) * invoked app_open and app_close * renamed Budget Panel into Finance * improve loading status events * separate hospital capacities * implement healthcare rules & structs * handle food coverage in state * handle rule events - don't look at this code is hideous * finance data handling & opened event * implement update app for finance app * finish finance events app * healthcare app opened event * add healthcare events * add welfare events * add business events (complete events) * document ipc events * fix md docs oopsies * one more oopsie * comma * fix runtime error / 0 * remove frontend ready event * Frontend 3 (#39) * removed ToolBarItem * moved types * cleanup * added new apps * loading screen update * spend welfare & funding appropriately * fix conflicts & game crash * game actually runs at normal speed * remove commented code * implement basic retirement system * safe error handling * Frontend 4 (#40) * fix window template * loading screen changes (unfinished) * loading screen (done) * start menu * added one more button * notifications (1) * notifications 2 * css units * little cleanup * make birth rate dynamic * prevent babies becoming pregnant lmao * clippy cleanup * generate new businesses midgame * Frontend 5 (#41) * added latest notification display * notification severity * handle open_app error * event data flow to frontend * Frontend 6 (#42) * start remaking the system * refactoring * test tab app * added templates * added username to the tab window * rewritten email app * rewritten finance * rewritten healthcare * fix * rewritten welfare * rewritten business * added modals * add back app event handling * begin finance budgets tab * fix resize invalidating data bug * make finance budgets functional * fix business market allocation bugs * enable people to afford no food * fix bugs & improve budgets panel styling * fix budget panel bugs * fix estimated income * fix eail app * fix healthcare capacity bug * further fix healthcare calculations * start finance overview & pins * fix data mutability * fix pinning & data update bugs * add finance app rules * implement overviews and rules for all apps * complete all apps functionality * minor ui and styling improvements * fix minor styling & mutability bugs * fix notifications, budgets error handling, bug fixes, styling fixes, UI improvements * welcome email * polishing & bug fixes * maximize animation * mistakes were made * improve health simulation * complete testing improvements * start emails & bug fixing * lil tweek * fix emails live update * correct notif button colors * send out email for high unemployed counts * form vaildiation & error handling * change day duration to 5s * complete dist version --------- Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com> Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com> Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com> * update readme * update readme * oopsie * Delete Cargo.lock * Update README.md * style: rustfmt (#45) Signed-off-by: AltF2 <contact@altf2.dev> --------- Signed-off-by: AltF2 <contact@altf2.dev> Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com> Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com> Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com> Co-authored-by: AltF2 <62047267+AltF02@users.noreply.github.com> * remove context menu * fix notification bugs * quick styling change --------- Signed-off-by: AltF2 <contact@altf2.dev> Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com> Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com> Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com> Co-authored-by: AltF2 <62047267+AltF02@users.noreply.github.com>
1 parent f4de9eb commit c339d95

File tree

5 files changed

+167
-159
lines changed

5 files changed

+167
-159
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The slick UX Design for this app was created completely by [Lemon Foxmere](https
2121
The fundamentals of the desktop UI was created in svelte by [Exedice](https://github.com/Ex-ce-pt).
2222

2323
### Z88
24+
2425
[Z88](https://github.com/maksymixs) helped out with the wireframe for the desktop UI and came up with some game design ideas for incumbency.
2526

2627
## Recommended IDE Setup

src-tauri/tauri.conf.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
},
5555
"windows": [
5656
{
57-
"fullscreen": true,
57+
"fullscreen": false,
5858
"height": 600,
59-
"resizable": false,
59+
"resizable": true,
6060
"title": "Incumbency",
6161
"width": 800
6262
}

src/App.svelte

Lines changed: 78 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,86 @@
11
<script lang="ts">
2-
3-
import MainMenu from './components/views/MainMenu.svelte';
4-
import NewGameMenu from './components/views/NewGameMenu.svelte';
5-
import LoadGameMenu from './components/views/LoadGameMenu.svelte';
6-
import MultiplayerMenu from './components/views/MultiplayerMenu.svelte';
7-
import SettingsMenu from './components/views/SettingsMenu.svelte';
8-
import Credits from './components/views/Credits.svelte';
9-
import Loading from './components/game/desktop/Loading.svelte';
10-
import SingleplayerGame from './components/views/SingleplayerGame.svelte';
11-
import MultiplayerGame from './components/views/MultiplayerGame.svelte';
12-
13-
import { appState } from './stores/appState'
14-
15-
type AnyAppState = typeof MainMenu |
16-
typeof NewGameMenu |
17-
typeof LoadGameMenu |
18-
typeof MultiplayerMenu |
19-
typeof SettingsMenu |
20-
typeof Credits |
21-
typeof Loading |
22-
typeof SingleplayerGame |
23-
typeof MultiplayerGame;
24-
25-
let currentComponent: AnyAppState | null = null;
26-
27-
appState.subscribe(value => {
28-
switch (value) {
29-
case 'MainMenu':
30-
currentComponent = MainMenu;
31-
break;
32-
33-
case 'NewGameMenu':
34-
currentComponent = NewGameMenu;
35-
break;
36-
37-
case 'LoadGameMenu':
38-
currentComponent = LoadGameMenu;
39-
break;
40-
41-
case 'MultiplayerMenu':
42-
currentComponent = MultiplayerMenu;
43-
break;
44-
45-
case 'SettingsMenu':
46-
currentComponent = SettingsMenu;
47-
break;
48-
49-
case 'Credits':
50-
currentComponent = Credits;
51-
break;
52-
53-
case 'Singleplayer':
54-
currentComponent = SingleplayerGame;
55-
break;
56-
57-
case 'Multiplayer':
58-
currentComponent = MultiplayerGame;
59-
break;
60-
61-
default:
62-
currentComponent = null;
63-
console.error(`Impossible condition - no such app state: ${value}`);
64-
break;
65-
};
66-
});
67-
2+
import MainMenu from "./components/views/MainMenu.svelte";
3+
import NewGameMenu from "./components/views/NewGameMenu.svelte";
4+
import LoadGameMenu from "./components/views/LoadGameMenu.svelte";
5+
import MultiplayerMenu from "./components/views/MultiplayerMenu.svelte";
6+
import SettingsMenu from "./components/views/SettingsMenu.svelte";
7+
import Credits from "./components/views/Credits.svelte";
8+
import Loading from "./components/game/desktop/Loading.svelte";
9+
import SingleplayerGame from "./components/views/SingleplayerGame.svelte";
10+
import MultiplayerGame from "./components/views/MultiplayerGame.svelte";
11+
12+
import { appState } from "./stores/appState";
13+
14+
type AnyAppState =
15+
| typeof MainMenu
16+
| typeof NewGameMenu
17+
| typeof LoadGameMenu
18+
| typeof MultiplayerMenu
19+
| typeof SettingsMenu
20+
| typeof Credits
21+
| typeof Loading
22+
| typeof SingleplayerGame
23+
| typeof MultiplayerGame;
24+
25+
let currentComponent: AnyAppState | null = null;
26+
27+
appState.subscribe((value) => {
28+
switch (value) {
29+
case "MainMenu":
30+
currentComponent = MainMenu;
31+
break;
32+
33+
case "NewGameMenu":
34+
currentComponent = NewGameMenu;
35+
break;
36+
37+
case "LoadGameMenu":
38+
currentComponent = LoadGameMenu;
39+
break;
40+
41+
case "MultiplayerMenu":
42+
currentComponent = MultiplayerMenu;
43+
break;
44+
45+
case "SettingsMenu":
46+
currentComponent = SettingsMenu;
47+
break;
48+
49+
case "Credits":
50+
currentComponent = Credits;
51+
break;
52+
53+
case "Singleplayer":
54+
currentComponent = SingleplayerGame;
55+
break;
56+
57+
case "Multiplayer":
58+
currentComponent = MultiplayerGame;
59+
break;
60+
61+
default:
62+
currentComponent = null;
63+
console.error(
64+
`Impossible condition - no such app state: ${value}`
65+
);
66+
break;
67+
}
68+
});
69+
70+
document.addEventListener("contextmenu", (event) => event.preventDefault());
6871
</script>
6972

7073
<main>
71-
72-
{#if currentComponent != null}
73-
74-
<svelte:component this={currentComponent} />
75-
76-
{:else}
77-
78-
<p>Undefined app state</p>
79-
80-
{/if}
81-
74+
{#if currentComponent != null}
75+
<svelte:component this={currentComponent} />
76+
{:else}
77+
<p>Undefined app state</p>
78+
{/if}
8279
</main>
8380

8481
<style>
85-
86-
main {
87-
width: 100%;
88-
height: 100%;
89-
}
90-
82+
main {
83+
width: 100%;
84+
height: 100%;
85+
}
9186
</style>

src/components/game/desktop/Desktop.svelte

Lines changed: 53 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
let focusedApp: number | null = null;
5454
5555
let notifications: NotificationData[] = [];
56-
let showLatestNotification = true;
5756
5857
let modalState: ModalState = "closed";
5958
let modalTimerResolve: (() => void) | null = null;
@@ -85,6 +84,13 @@
8584
}
8685
};
8786
87+
const unminimizeApp = (index: number) => {
88+
if (index < 0 || index >= apps.length || !apps[index].minimized) return;
89+
90+
apps[index].minimized = false;
91+
updateUI();
92+
};
93+
8894
const updateUI = () => {
8995
apps = apps;
9096
};
@@ -136,10 +142,17 @@
136142
137143
const toggleNotificationsSection = (): void => {
138144
notificationSectionExpanded = !notificationSectionExpanded;
139-
showLatestNotification = false;
145+
146+
if (notificationSectionExpanded) {
147+
for (let i = 0; i < notifications.length; i++) {
148+
notifications[i].shown = false;
149+
}
150+
}
140151
};
141152
142153
const closeStartMenuIfClickedAway = (e: MouseEvent): void => {
154+
if (startMenu == null) return;
155+
143156
if (e.target == null || startMenu.contains(e.target as HTMLElement))
144157
return;
145158
@@ -156,10 +169,10 @@
156169
}
157170
158171
n.date = date;
172+
n.shown = !notificationSectionExpanded;
159173
160174
notifications = [...notifications, n]; // for mutability updates
161175
162-
showLatestNotification = true;
163176
updateUI();
164177
};
165178
@@ -329,38 +342,6 @@
329342
/>
330343
{/each}
331344

332-
{#if showLatestNotification && notifications.length > 0}
333-
<div
334-
class="single-notification-container"
335-
style="right: {NOTIFICATION_MARGIN_X};"
336-
>
337-
<Notification
338-
actionTitle={notifications[notifications.length - 1]
339-
.actionTitle}
340-
actionFunction={notifications[
341-
notifications.length - 1
342-
].actionTitle?.toLowerCase() === "open app"
343-
? () => {
344-
apps.forEach((app, idx) => {
345-
if (
346-
app.name.toLowerCase() ===
347-
notifications[
348-
notifications.length - 1
349-
].app?.toLowerCase()
350-
) {
351-
handleOpenApp(idx);
352-
}
353-
});
354-
}
355-
: () => {}}
356-
justDisplayed={true}
357-
onDismissed={() =>
358-
notifications.splice(notifications.length - 1, 1)}
359-
data={notifications[notifications.length - 1]}
360-
/>
361-
</div>
362-
{/if}
363-
364345
{#if notificationSectionExpanded}
365346
<div
366347
class="notifications-section"
@@ -384,11 +365,45 @@
384365
: () => {}}
385366
onDismissed={() => {
386367
notifications.splice(idx, 1);
368+
notifications = [...notifications]; // so it updates :/
387369
}}
370+
justDisplayed={false}
388371
data={notif}
389372
/>
390373
{/each}
391374
</div>
375+
{:else}
376+
<div
377+
class="notifications-section"
378+
style="width: calc({NOTIFICATION_WIDTH} + {NOTIFICATION_MARGIN_X} * 2); border: none; background: none;"
379+
>
380+
{#each notifications.reverse() as notif, idx}
381+
{#if notif.shown}
382+
<Notification
383+
actionTitle={notif.actionTitle}
384+
actionFunction={notif.actionTitle?.toLowerCase() ===
385+
"open app"
386+
? () => {
387+
apps.forEach((app, idx) => {
388+
if (
389+
app.name.toLowerCase() ===
390+
notif.app?.toLowerCase()
391+
) {
392+
handleOpenApp(idx);
393+
}
394+
});
395+
}
396+
: () => {}}
397+
onDismissed={() => {
398+
notifications[idx].shown = false;
399+
notifications = [...notifications]; // so it updates :/
400+
}}
401+
justDisplayed={true}
402+
data={notif}
403+
/>
404+
{/if}
405+
{/each}
406+
</div>
392407
{/if}
393408
</div>
394409

@@ -402,6 +417,7 @@
402417
title={shortcut.name}
403418
on:click={() => {
404419
focusedApp = i;
420+
unminimizeApp(i);
405421
updateUI();
406422
}}
407423
on:keydown={() => {}}
@@ -524,12 +540,12 @@
524540
color: var(--color-bg);
525541
font-weight: bold;
526542
}
527-
543+
/*
528544
.single-notification-container {
529545
position: absolute;
530546
top: 0;
531547
z-index: 20000;
532-
}
548+
} */
533549
534550
.notification-section-toggle {
535551
position: absolute;

0 commit comments

Comments
 (0)