From 604f91c70a8911855329926aa89d1f64c15e29dd Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 19 Mar 2014 17:56:15 +0100
Subject: [PATCH] Really hide corner buttons.

---
 src/gui/feedsview.h   | 20 --------------------
 src/gui/tabwidget.cpp | 27 ++++++++++++++++++++-------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h
index 6cfbfc708..257623435 100644
--- a/src/gui/feedsview.h
+++ b/src/gui/feedsview.h
@@ -24,26 +24,6 @@
 #include "core/feedsmodel.h"
 #include "core/settings.h"
 
-/*
-#include <QStyledItemDelegate>
-#include <QPainter>
-
-class Del : public QStyledItemDelegate {
-    Q_OBJECT
-
-  protected:
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
-      painter->setBrush(Qt::SolidPattern);
-      painter->setPen(Qt::SolidLine);
-
-      QRect rc(option.rect);
-      rc.adjust(2, 2, -2, -2);
-
-      painter->fillRect(rc, Qt::gray);
-      painter->drawText(rc, "123", Qt::AlignCenter | Qt::AlignVCenter);
-    }
-};
-*/
 
 class FeedsProxyModel;
 class FeedsModelFeed;
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index 57de3c2ac..dff3dcc7b 100644
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -51,8 +51,6 @@ void TabWidget::setupCornerButton() {
   m_btnAddTab->setIcon(IconThemeFactory::instance()->fromTheme("list-add"));
 
   connect(m_btnAddTab, SIGNAL(clicked()), this, SLOT(addEmptyBrowser()));
-
-  setCornerWidget(m_btnAddTab, Qt::TopRightCorner);
 }
 
 void TabWidget::setupMainMenuButton() {
@@ -64,8 +62,6 @@ void TabWidget::setupMainMenuButton() {
   m_btnMainMenu->setPopupMode(QToolButton::InstantPopup);
 
   connect(m_btnMainMenu, SIGNAL(clicked()), this, SLOT(openMainMenu()));
-
-  setCornerWidget(m_btnMainMenu, Qt::TopLeftCorner);
 }
 
 void TabWidget::openMainMenu() {
@@ -90,9 +86,26 @@ void TabWidget::openMainMenu() {
 }
 
 void TabWidget::checkTabBarVisibility() {
-  tabBar()->setVisible(count() > 1 || !Settings::instance()->value(APP_CFG_GUI,
-                                                                   "hide_tabbar_one_tab",
-                                                                   true).toBool());
+  bool should_be_visible = count() > 1 || !Settings::instance()->value(APP_CFG_GUI,
+                                                                     "hide_tabbar_one_tab",
+                                                                     true).toBool();
+
+  if (should_be_visible) {
+    setCornerWidget(m_btnMainMenu, Qt::TopLeftCorner);
+    setCornerWidget(m_btnAddTab, Qt::TopRightCorner);
+
+    m_btnMainMenu->setVisible(true);
+    m_btnAddTab->setVisible(true);
+  }
+  else {
+    setCornerWidget(0, Qt::TopLeftCorner);
+    setCornerWidget(0, Qt::TopRightCorner);
+
+    m_btnMainMenu->setVisible(false);
+    m_btnAddTab->setVisible(false);
+  }
+
+  tabBar()->setVisible(should_be_visible);
 }
 
 void TabWidget::tabInserted(int index) {