diff --git a/src/actions.js b/src/actions.js index dd2147a..c33b169 100644 --- a/src/actions.js +++ b/src/actions.js @@ -59,6 +59,7 @@ export const application_actions = ({ application }) => { }); active_action.connect("activate", () => { + application.get_active_window()._small_window.hide(); application.active_window.show(); }); diff --git a/src/application.js b/src/application.js index 9c0a804..c7756ca 100644 --- a/src/application.js +++ b/src/application.js @@ -26,6 +26,7 @@ import Gdk from 'gi://Gdk'; import { gettext as _ } from 'gettext'; import Style from './assets/style.css'; import { Window } from './window.js'; +import { SmallWindow } from './components/small-window/small-window.js'; import { application_actions } from './actions.js'; import { utils } from './utils.js'; diff --git a/src/components/small-window/small-window.js b/src/components/small-window/small-window.js index 5cabb84..fa9fa36 100644 --- a/src/components/small-window/small-window.js +++ b/src/components/small-window/small-window.js @@ -67,7 +67,7 @@ export class SmallWindow extends Adw.Window { /** * - * Setup event controles (Mouse enter|leave)... + * Setup event controls (Mouse enter|leave)... * */ _setup_event_controller() { @@ -81,3 +81,4 @@ export class SmallWindow extends Adw.Window { this._overlay.add_controller(controller) } } + diff --git a/src/utils.js b/src/utils.js index eab7844..5b96dd9 100644 --- a/src/utils.js +++ b/src/utils.js @@ -61,7 +61,7 @@ const format_time = (time) => { * * Sound Player * @param {object} params - * @param {Adw.Applicatin} params.application + * @param {Adw.Application} params.application * @param {Settings} params.settings * */ @@ -172,7 +172,7 @@ export const notification = ({ application, settings }) => { /** * * Send notification - * @param {object} params + * @param {object} params * @param {string} params.title * @param {string} params.body * @@ -183,7 +183,7 @@ export const notification = ({ application, settings }) => { notification.set_body(body); const high_priority_notify = settings.get_boolean('high-priority-notify'); notification.set_priority(high_priority_notify ? Gio.NotificationPriority.URGENT : Gio.NotificationPriority.NORMAL); - if(!application.get_active_window().visible) { + if(!application.get_active_window().visible && !application.get_active_window()._small_window.visible) { notification.add_button( _("Launch"), "app.open", @@ -328,7 +328,6 @@ const time_utils = () => { } } - /** * * Load all utils methods diff --git a/src/window.js b/src/window.js index 441e8b0..178eb70 100644 --- a/src/window.js +++ b/src/window.js @@ -69,6 +69,7 @@ export class Window extends Adw.ApplicationWindow { this._statistics_page.set_child(this._statistics_page_component); this._small_window = new SmallWindow({ application }); this._timer = application.utils.timer; + this.application = application; this._timer.connect('start', () => { this._shorten_window.set_sensitive(true); @@ -104,10 +105,10 @@ export class Window extends Adw.ApplicationWindow { const value = parameter.get_string()[0]; if (value === 'open') { this.hide(); - this._small_window.present(); + this._small_window.show(); } else { - this.present(); this._small_window.hide(); + this.show(); } }); this.add_action(toggle_small_window);