You need to wake upYou need to wake upYou need to wake upYou need to wake up
YouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUp ouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpY uNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYo NeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYou eedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouN edToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNe dToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNee ToWakeUpYouNeedToWakeUpNeedWAKEUPNeedYouNeedYouWakeUpYouNeed oWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedT WakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedTo akeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToW keUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWa eUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWak UpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWake pYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeU [~~~~~~~~~~~~~~~~~~~~~~~~~~WakeUp~~~~~~~~~~~~~~~~~~~~~~~~~~]
This commit is contained in:
@@ -66,7 +66,7 @@ public:
|
||||
};
|
||||
public:
|
||||
virtual void postInitialized() {}
|
||||
virtual void show() = 0;
|
||||
virtual void show(bool focus = true) = 0;
|
||||
virtual void hide() = 0;
|
||||
virtual void close() = 0;
|
||||
virtual BOOL getVisible() = 0;
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
class LLWindowHeadless : public LLWindow
|
||||
{
|
||||
public:
|
||||
/*virtual*/ void show() {};
|
||||
/*virtual*/ void show(bool) {};
|
||||
/*virtual*/ void hide() {};
|
||||
/*virtual*/ void close() {};
|
||||
/*virtual*/ BOOL getVisible() {return FALSE;};
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
class LLWindowMesaHeadless : public LLWindow
|
||||
{
|
||||
public:
|
||||
/*virtual*/ void show() {};
|
||||
/*virtual*/ void show(bool) {};
|
||||
/*virtual*/ void hide() {};
|
||||
/*virtual*/ void close() {};
|
||||
/*virtual*/ BOOL getVisible() {return FALSE;};
|
||||
|
||||
@@ -790,7 +790,7 @@ LLWindowSDL::~LLWindowSDL()
|
||||
}
|
||||
|
||||
|
||||
void LLWindowSDL::show()
|
||||
void LLWindowSDL::show(bool focus)
|
||||
{
|
||||
// *FIX: What to do with SDL?
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
class LLWindowSDL : public LLWindow
|
||||
{
|
||||
public:
|
||||
/*virtual*/ void show();
|
||||
/*virtual*/ void show(bool focus);
|
||||
/*virtual*/ void hide();
|
||||
/*virtual*/ void close();
|
||||
/*virtual*/ BOOL getVisible();
|
||||
|
||||
@@ -717,9 +717,10 @@ void LLWindowWin32::postInitialized()
|
||||
mCallbacks->handleDPIScaleChange(this, xDPIScale, yDPIScale);
|
||||
}
|
||||
|
||||
void LLWindowWin32::show()
|
||||
void LLWindowWin32::show(bool take_focus)
|
||||
{
|
||||
ShowWindow(mWindowHandle, SW_SHOW);
|
||||
if (!take_focus) return;
|
||||
SetForegroundWindow(mWindowHandle);
|
||||
SetFocus(mWindowHandle);
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ class LLWindowWin32 : public LLWindow
|
||||
{
|
||||
public:
|
||||
/*virtual*/ void postInitialized();
|
||||
/*virtual*/ void show();
|
||||
/*virtual*/ void show(bool focus = true);
|
||||
/*virtual*/ void hide();
|
||||
/*virtual*/ void close();
|
||||
/*virtual*/ BOOL getVisible();
|
||||
|
||||
@@ -945,8 +945,10 @@ bool idle_startup()
|
||||
|
||||
// Push our window frontmost
|
||||
// Singu Note: Actually, don't! But flash the window to let the user know
|
||||
auto& window(*gViewerWindow->getWindow());
|
||||
window.show(false);
|
||||
if (gSavedSettings.getBOOL("LiruFlashWhenMinimized")) // No, we're not minimized, but if you flash my bar, I will give you the biggest SIGSEGV ~Liru <3
|
||||
gViewerWindow->getWindow()->flashIcon(5.f);
|
||||
window.flashIcon(5.f);
|
||||
display_startup();
|
||||
|
||||
// DEV-16927. The following code removes errant keystrokes that happen while the window is being
|
||||
|
||||
Reference in New Issue
Block a user