some fixes to options windows positioning and size;

global fix for hbox/vbox margin and spacing widths

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2665 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 26 insertions, 0 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 308ffe1a2..d1ae6cf16 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -48,6 +48,7 @@
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QHeaderView>
+#include <QDesktopWidget>
 
 //FIXME: some headers must be hidden
 
@@ -280,6 +281,30 @@ KviOptionsDialog::~KviOptionsDialog()
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
+void KviOptionsDialog::showEvent(QShowEvent *e)
+{
+	QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+		
+	int w = r.width();
+	int h = r.height();
+
+	int ww = width();
+	int wh = height();
+
+	if(w < 800)
+	{
+		// 640x480
+		if(ww < 630)ww = 630;
+	} else {
+		if(ww < 770)ww = 770;
+	}
+	
+	setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh);
+
+	move((r.width() - width())/2,(r.height() - height())/2);
+
+	QDialog::showEvent(e);
+}
 
 void KviOptionsDialog::searchLineEditTextChanged(const QString &)
 {
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 7b5cef93f..7ec6fe666 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -91,6 +91,7 @@ protected:
 	void apply(bool bDialogAboutToClose);
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void keyPressEvent( QKeyEvent * e );
+	virtual void showEvent(QShowEvent *e);
 	bool recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords);
 public:
 	void search(const QString &szKeywords);