Merge branch 'feature-minimize' into develop

This commit is contained in:
Ximi1970
2020-04-21 21:39:35 +02:00
3 changed files with 18 additions and 4 deletions

View File

@@ -416,6 +416,8 @@ void WindowCtrlUnix::hideWindowEvent( quint64 window, bool set )
_NET_WM_STATE_REMOVE,
static_cast<long>( XInternAtom( m_display, "_NET_WM_STATE_SKIP_TASKBAR", False ) ) );
}
XFlush( m_display );
}

View File

@@ -35,6 +35,7 @@ WindowCtrl::WindowCtrl( Preferences* pref, QObject *parent )
/*
* Initialize
*/
m_state = QString();
setMinimizeType( m_pref->getMinimizeType() );
/*

View File

@@ -1,6 +1,8 @@
var SysTrayX = {
debugAccounts: false,
startupState: undefined,
pollTiming: {
pollStartupDelay: "60",
pollInterval: "60",
@@ -192,6 +194,14 @@ SysTrayX.Messaging = {
numberColor: numberColor,
},
});
if (SysTrayX.startupState) {
// Send startup state after the prefs
// so the hide is handled conform the prefs
SysTrayX.Link.postSysTrayXMessage({ window: SysTrayX.startupState });
SysTrayX.startupState = undefined;
}
},
onSendIconStorageError: function (error) {
@@ -375,6 +385,10 @@ async function start() {
});
}
SysTrayX.startupState = state;
console.debug("State: "+ SysTrayX.startupState);
// Get the poll timing
SysTrayX.pollTiming = await getPollTiming();
@@ -382,7 +396,7 @@ async function start() {
SysTrayX.platformInfo = await browser.runtime
.getPlatformInfo()
.then((info) => info);
console.log("OS: " + SysTrayX.platformInfo.os);
console.log("Arch: " + SysTrayX.platformInfo.arch);
console.log("Nack-Arch: " + SysTrayX.platformInfo.nacl_arch);
@@ -406,9 +420,6 @@ async function start() {
// Setup the link first
SysTrayX.Link.init();
// Send current state
SysTrayX.Link.postSysTrayXMessage({ window: state });
// Main start
SysTrayX.Messaging.init();
}