Try to resolve problem with small resolution #241

FACT-Team · Apr 14, 2015 · 43570af · 43570af
1 parent 4ba1d5a
commit 43570af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/gui/mainwindow/mainwindow.cpp b/src/gui/mainwindow/mainwindow.cpp
@@ -76,6 +76,7 @@ int MainWindow::getCurrentTableId(QTableView *tbl) {
 }
 
 int MainWindow::getCurrentCustomerId() {
+    mergeDocks();
     return getCurrentTableId(ui->tblCustomers);
 }
 
@@ -155,9 +156,7 @@ void MainWindow::addDoc(bool isBilling) {
 
 void MainWindow::resizeEvent(QResizeEvent *event)
 {    
-    if (height() < 540) {
-        tabifyDockWidget(ui->dockUserData, ui->dockCustomerData);
-    }
+    mergeDocks();
 
     switch (ui->stackedWidget->currentIndex()) {
         case 0:
@@ -363,6 +362,12 @@ void MainWindow::lockProject() {
     updateTableProjects(getCurrentCustomerId());
 }
 
+void MainWindow::mergeDocks() {
+    if (height() < 540) {
+        tabifyDockWidget(ui->dockUserData, ui->dockCustomerData);
+    }
+}
+
 void MainWindow::editUser()
 {
     if (UserDataDialog().exec()) {

diff --git a/src/gui/mainwindow/mainwindow.h b/src/gui/mainwindow/mainwindow.h
@@ -261,6 +261,8 @@ public slots:
      * @brief lockProject Lock the current project
      */
     void lockProject();
+
+    void mergeDocks();
 private slots:
     /**
      * @brief MainWindow::openContextualMenuTable open contextual menu