hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 08:34:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #917 from xiaoyifang/fix/statusbar

Browse source 
fix: statusbar crash  at some rare conditions
This commit is contained in:
xiaoyifang 2023-07-01 22:59:04 +08:00 committed by GitHub
parent 8b88ea544e ed8072d78f
commit 2621fd694d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ui/mainstatusbar.cc
View file

@ -40,6 +40,9 @@ MainStatusBar::MainStatusBar( QWidget *parent ) : QWidget( parent )
connect( timer, &QTimer::timeout, this, &MainStatusBar::clearMessage ); connect( timer, &QTimer::timeout, this, &MainStatusBar::clearMessage );
setAutoFillBackground( true ); setAutoFillBackground( true );
if ( parent )
move( 0, parent->height() - height() );
} }
void MainStatusBar::clearMessage() void MainStatusBar::clearMessage()
@ -67,29 +70,23 @@ void MainStatusBar::setBackgroundMessage(const QString & bkg_message )
} }
} }
void MainStatusBar::showMessage(const QString & str, int timeout, const QPixmap & pixmap) void MainStatusBar::showMessage( const QString & str, int timeout, const QPixmap & pixmap )
{ {
textWidget->setText( message = str ); textWidget->setText( message = str );
picWidget->setPixmap( pixmap ); picWidget->setPixmap( pixmap );
if ( !picWidget->pixmap().isNull() ) if ( !picWidget->pixmap().isNull() ) {
{
picWidget->setFixedSize( textWidget->height(), textWidget->height() ); picWidget->setFixedSize( textWidget->height(), textWidget->height() );
} }
else else {
{
picWidget->setFixedSize( 0, 0 ); picWidget->setFixedSize( 0, 0 );
} }
if ( timeout > 0 ) if ( timeout > 0 ) {
{
timer->start( timeout ); timer->start( timeout );
} }
if ( parentWidget() && parentWidget()->isVisible() ) { raise();
raise(); show();
show();
move( QPoint( 0, parentWidget()->height() - height() ) );
}
} }
void MainStatusBar::mousePressEvent ( QMouseEvent * ) void MainStatusBar::mousePressEvent ( QMouseEvent * )