From a57d5ece0a9351e9c7092e81b8934b1b0da81b52 Mon Sep 17 00:00:00 2001
From: Jeremy Bullock <jcbullock@gmail.com>
Date: Wed, 1 Jul 2020 00:48:21 -0600
Subject: [PATCH] Disable titlebar double click (#67)

* Remove classic xsheet layout. Set compact default.

* Disable double click on non viewer titlebars
---
 toonz/sources/toonz/preferencespopup.cpp |  3 +--
 toonz/sources/toonz/toolbar.cpp          | 12 +++++++++---
 toonz/sources/toonzqt/dockwidget.cpp     |  7 +++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
index 90accbd2..659093b1 100644
--- a/toonz/sources/toonz/preferencespopup.cpp
+++ b/toonz/sources/toonz/preferencespopup.cpp
@@ -1172,8 +1172,7 @@ QList<ComboBoxItem> PreferencesPopup::getComboItemList(
         {tr("Enable Tools For Level Only"), 1},
         {tr("Show Tools For Level Only"), 2}}},
       {xsheetLayoutPreference,
-       {{tr("Compact"), "Compact"}, 
-        {tr("Roomy"), "Roomy"}}},
+       {{tr("Compact"), "Compact"}, {tr("Roomy"), "Roomy"}}},
       {DragCellsBehaviour,
        {{tr("Cells Only"), 0}, {tr("Cells and Column Data"), 1}}},
       {keyframeType,  // note that the value starts from 1, not 0
diff --git a/toonz/sources/toonz/toolbar.cpp b/toonz/sources/toonz/toolbar.cpp
index 64d679ca..5f664d3f 100755
--- a/toonz/sources/toonz/toolbar.cpp
+++ b/toonz/sources/toonz/toolbar.cpp
@@ -84,9 +84,15 @@ Toolbar::Toolbar(QWidget *parent, bool isVertical)
           SLOT(setIsExpanded(bool)));
 
   updateToolbar();
-  QIcon moreIcon(":Resources/moredown.svg");
-  QToolButton *more = findChild<QToolButton *>("qt_toolbar_ext_button");
-  more->setIcon(moreIcon);
+  if (isVertical) {
+    QIcon moreIcon(":Resources/moredown.svg");
+    QToolButton *more = findChild<QToolButton *>("qt_toolbar_ext_button");
+    more->setIcon(moreIcon);
+  } else {
+    QIcon moreIcon(":Resources/more.svg");
+    QToolButton *more = findChild<QToolButton *>("qt_toolbar_ext_button");
+    more->setIcon(moreIcon);
+  }
 }
 
 //-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonzqt/dockwidget.cpp b/toonz/sources/toonzqt/dockwidget.cpp
index 5b23d2db..41adc78a 100644
--- a/toonz/sources/toonzqt/dockwidget.cpp
+++ b/toonz/sources/toonzqt/dockwidget.cpp
@@ -378,8 +378,11 @@ void DockWidget::mouseReleaseEvent(QMouseEvent *me) {
 //! DockWidgets respond to title bar double clicks maximizing the widget in
 //! layout's contents rect.
 void DockWidget::mouseDoubleClickEvent(QMouseEvent *me) {
-  if (!m_floating && isDragGrip(me->pos())) {
-    parentLayout()->setMaximized(this, !m_maximized);
+  std::string name = objectName().toStdString();
+  if (name == "FlipBook" || name == "SceneViewer" || name == "ComboViewer") {
+    if (!m_floating && isDragGrip(me->pos())) {
+      parentLayout()->setMaximized(this, !m_maximized);
+    }
   }
 }