Merge pull request #130 from Nheko-Reborn/0.7.0-dev

0.7.0 dev merge to master

1 files changed, 17 insertions, 8 deletions

diff --git a/src/Splitter.cpp b/src/Splitter.cpp

index ddb1dc1c..04375853 100644
--- a/src/Splitter.cpp
+++ b/src/Splitter.cpp
@@ -15,24 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QApplication>
-#include <QDebug>
-#include <QDesktopWidget>
 #include <QSettings>
-#include <QShortcut>
 
-#include "Config.h"
+#include "Logging.h"
 #include "Splitter.h"
 
 constexpr auto MaxWidth = (1 << 24) - 1;
 
 Splitter::Splitter(QWidget *parent)
   : QSplitter(parent)
-  , sz_{utils::calculateSidebarSizes(QFont{})}
+  , sz_{splitter::calculateSidebarSizes(QFont{})}
 {
         connect(this, &QSplitter::splitterMoved, this, &Splitter::onSplitterMoved);
         setChildrenCollapsible(false);
-        setStyleSheet("QSplitter::handle { image: none; }");
 }
 
 void
@@ -80,7 +75,7 @@ Splitter::onSplitterMoved(int pos, int index)
         auto s = sizes();
 
         if (s.count() < 2) {
-                qWarning() << "Splitter needs at least two children";
+                nhlog::ui()->warn("Splitter needs at least two children");
                 return;
         }
 
@@ -165,3 +160,17 @@ Splitter::showFullRoomList()
         left->show();
         left->setMaximumWidth(MaxWidth);
 }
+
+splitter::SideBarSizes
+splitter::calculateSidebarSizes(const QFont &f)
+{
+        const auto height = static_cast<double>(QFontMetrics{f}.lineSpacing());
+
+        SideBarSizes sz;
+        sz.small         = std::ceil(3.8 * height);
+        sz.normal        = std::ceil(16 * height);
+        sz.groups        = std::ceil(3 * height);
+        sz.collapsePoint = 2 * sz.normal;
+
+        return sz;
+}