Commit fa41e9b3 authored by Joachim Eibl's avatar Joachim Eibl

Fix for bug #3296890 Trapped on Mac screen after simulated merge

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@122 c8aa9fed-2811-0410-8543-893ada326672
parent 46a8b230
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <QSplitter> #include <QSplitter>
#include <QTextEdit> #include <QTextEdit>
#include <QItemDelegate> #include <QItemDelegate>
#include <QPushButton>
#include <kmenu.h> #include <kmenu.h>
...@@ -65,8 +66,9 @@ public: ...@@ -65,8 +66,9 @@ public:
setWindowFlags(Qt::Dialog); setWindowFlags(Qt::Dialog);
m_pTextEdit->setWordWrapMode(QTextOption::NoWrap); m_pTextEdit->setWordWrapMode(QTextOption::NoWrap);
m_pTextEdit->setReadOnly(true); m_pTextEdit->setReadOnly(true);
//setWindowModality( Qt::ApplicationModal ); QPushButton* pClose = new QPushButton(tr("Close"));
//showMaximized(); connect( pClose, SIGNAL(clicked()), this, SLOT(accept()));
pVLayout->addWidget(pClose);
} }
bool isEmpty(){ bool isEmpty(){
...@@ -93,6 +95,8 @@ public: ...@@ -93,6 +95,8 @@ public:
} }
QDialog::setVisible(bVisible); QDialog::setVisible(bVisible);
if ( bVisible )
setWindowState( windowState() | Qt::WindowMaximized );
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment