Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Make sure splash screen gets focus. Also better key press/release handling in working banner.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-11-30 13:10:34 +01:00
parent 72f2ef3617
commit 4635d9bf76
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_MINOR_LO 9
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 9 #define VER_LAMEXP_PATCH 9
#define VER_LAMEXP_BUILD 1490 #define VER_LAMEXP_BUILD 1495
#define VER_LAMEXP_CONFG 1348 #define VER_LAMEXP_CONFG 1348
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

4
src/Dialog_SplashScreen.cpp
View File

@ -126,7 +126,7 @@ void SplashScreen::showSplash(QThread *thread)
//Wait for window to show //Wait for window to show
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
splashScreen->repaint(); splashScreen->repaint(); lamexp_bring_to_front(splashScreen);
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
//Connect thread signals //Connect thread signals
@ -181,6 +181,7 @@ void SplashScreen::updateHandler(void)
else else
{ {
setWindowOpacity(1.0); setWindowOpacity(1.0);
lamexp_bring_to_front(this);
m_timer->stop(); m_timer->stop();
m_status = STATUS_WAIT; m_status = STATUS_WAIT;
} }
@ -209,6 +210,7 @@ void SplashScreen::threadComplete(void)
{ {
m_timer->start(FADE_DELAY); m_timer->start(FADE_DELAY);
} }
lamexp_bring_to_front(this);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

4
src/Dialog_WorkingBanner.cpp
View File

@ -236,12 +236,12 @@ void WorkingBanner::keyPressEvent(QKeyEvent *event)
QTimer::singleShot(0, parent(), SLOT(showMinimized())); QTimer::singleShot(0, parent(), SLOT(showMinimized()));
} }
event->ignore(); QDialog::keyPressEvent(event);
} }
void WorkingBanner::keyReleaseEvent(QKeyEvent *event) void WorkingBanner::keyReleaseEvent(QKeyEvent *event)
{ {
event->ignore(); QDialog::keyReleaseEvent(event);
} }
void WorkingBanner::closeEvent(QCloseEvent *event) void WorkingBanner::closeEvent(QCloseEvent *event)

1
src/Global.h
View File

@ -149,6 +149,7 @@ const QStringList &lamexp_arguments(void);
QStringList lamexp_available_codepages(bool noAliases = true); QStringList lamexp_available_codepages(bool noAliases = true);
bool lamexp_beep(int beepType); bool lamexp_beep(int beepType);
void lamexp_blink_window(QWidget *poWindow, unsigned int count = 10, unsigned int delay = 150); void lamexp_blink_window(QWidget *poWindow, unsigned int count = 10, unsigned int delay = 150);
bool lamexp_block_window_move(void *message);
bool lamexp_bring_process_to_front(const unsigned long pid); bool lamexp_bring_process_to_front(const unsigned long pid);
bool lamexp_bring_to_front(const QWidget *win); bool lamexp_bring_to_front(const QWidget *win);
bool lamexp_broadcast(int eventType, bool onlyToVisible); bool lamexp_broadcast(int eventType, bool onlyToVisible);

28
src/Global_Win32.cpp
View File

@ -1495,6 +1495,26 @@ int lamexp_system_message(const wchar_t *text, int beepType)
return MessageBoxW(NULL, text, L"LameXP", flags); return MessageBoxW(NULL, text, L"LameXP", flags);
} }
/*
* Block window "move" message
*/
bool lamexp_block_window_move(void *message)
{
if(message)
{
MSG *msg = reinterpret_cast<MSG*>(message);
if((msg->message == WM_SYSCOMMAND) && (msg->wParam == SC_MOVE))
{
return true;
}
if((msg->message == WM_NCLBUTTONDOWN) && (msg->wParam == HTCAPTION))
{
return true;
}
}
return false;
}
/* /*
* Suspend calling thread for N milliseconds * Suspend calling thread for N milliseconds
*/ */
@ -1745,8 +1765,12 @@ bool lamexp_bring_to_front(const QWidget *window)
if(window) if(window)
{ {
ret = (SetForegroundWindow(window->winId()) == TRUE); for(int i = 0; (i < 5) && (!ret); i++)
SwitchToThisWindow(window->winId(), TRUE); {
ret = (SetForegroundWindow(window->winId()) != FALSE);
SwitchToThisWindow(window->winId(), TRUE);
}
LockSetForegroundWindow(LSFW_LOCK);
} }
return ret; return ret;