mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-24 00:14:06 +00:00
fix: possible crash (#836)
* fix: possible crash when show statusbar message * windows qt upgrade to qt6.5.1 * Update src/ui/mainstatusbar.cc --------- Co-authored-by: YiFang Xiao <yifang.xiao@noreply.com>
This commit is contained in:
parent
dfd3a86c7f
commit
ca4664f209
2
.github/workflows/macos-homebrew-xapian.yml
vendored
2
.github/workflows/macos-homebrew-xapian.yml
vendored
|
@ -22,7 +22,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [macos-11,macos-12]
|
||||
qt_ver: [6.4.3]
|
||||
qt_ver: [ 6.5.1 ]
|
||||
qt_arch: [clang_64]
|
||||
env:
|
||||
targetName: GoldenDict
|
||||
|
|
2
.github/workflows/ubuntu-6.2-xapian.yml
vendored
2
.github/workflows/ubuntu-6.2-xapian.yml
vendored
|
@ -26,7 +26,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest]
|
||||
qt_ver: [6.4.3]
|
||||
qt_ver: [ 6.5.1 ]
|
||||
qt_arch: [gcc_64]
|
||||
env:
|
||||
version: 23.06.02
|
||||
|
|
2
.github/workflows/windows-6.x-xapian.yml
vendored
2
.github/workflows/windows-6.x-xapian.yml
vendored
|
@ -27,7 +27,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [windows-2019]
|
||||
qt_ver: [6.4.3]
|
||||
qt_ver: [6.5.1]
|
||||
qt_arch: [win64_msvc2019_64]
|
||||
env:
|
||||
targetName: GoldenDict.exe
|
||||
|
|
|
@ -85,9 +85,11 @@ void MainStatusBar::showMessage(const QString & str, int timeout, const QPixmap
|
|||
{
|
||||
timer->start( timeout );
|
||||
}
|
||||
raise();
|
||||
show();
|
||||
move( QPoint( 0, parentWidget()->height() - height() ) );
|
||||
if ( parentWidget() && parentWidget()->isVisible() ) {
|
||||
raise();
|
||||
show();
|
||||
move( QPoint( 0, parentWidget()->height() - height() ) );
|
||||
}
|
||||
}
|
||||
|
||||
void MainStatusBar::mousePressEvent ( QMouseEvent * )
|
||||
|
|
Loading…
Reference in a new issue