From 5237ee313514524fd357b5dff86efa4c90748766 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 22 Sep 2021 09:59:51 +0200
Subject: [PATCH] force notifications and shortcuts to adhere to global scroll
 area

---
 .../dynamicshortcutswidget.h                  |  2 --
 src/librssguard/gui/dialogs/formsettings.cpp  | 20 +----------
 .../gui/notifications/notificationseditor.cpp |  8 ++---
 .../gui/notifications/notificationseditor.h   |  4 +--
 .../gui/notifications/notificationseditor.ui  |  8 +----
 .../gui/settings/settingsshortcuts.ui         | 36 +------------------
 6 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h
index 1cac52fed..6ed2efd8f 100644
--- a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h
+++ b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h
@@ -14,8 +14,6 @@ class DynamicShortcutsWidget : public QWidget {
   Q_OBJECT
 
   public:
-
-    // Constructors and destructors.
     explicit DynamicShortcutsWidget(QWidget* parent = nullptr);
     virtual ~DynamicShortcutsWidget();
 
diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp
index 5b55fc713..95b39cf40 100644
--- a/src/librssguard/gui/dialogs/formsettings.cpp
+++ b/src/librssguard/gui/dialogs/formsettings.cpp
@@ -20,6 +20,7 @@
 #include "gui/settings/settingsshortcuts.h"
 
 #include <QPainter>
+#include <QScrollArea>
 #include <QScrollBar>
 
 FormSettings::FormSettings(QWidget& parent)
@@ -134,31 +135,12 @@ void FormSettings::cancelSettings() {
   }
 }
 
-class Scr : public QScrollBar {
-  public:
-    explicit Scr(QWidget* parent) : QScrollBar(parent) {}
-
-  protected:
-    virtual void paintEvent(QPaintEvent* event) {
-      QScrollBar::paintEvent(event);
-
-      QPainter p(this);
-
-      p.setPen(QPen(Qt::GlobalColor::gray, 0.7));
-
-      p.drawRect(rect().marginsRemoved(QMargins(0, 0, 1, 1)));
-    }
-
-};
-
 void FormSettings::addSettingsPanel(SettingsPanel* panel) {
   m_ui.m_listSettings->addItem(panel->title());
   m_panels.append(panel);
 
   QScrollArea* scr = new QScrollArea(m_ui.m_stackedSettings);
 
-  //scr->setHorizontalScrollBar(new Scr(scr));
-  //scr->setVerticalScrollBar(new Scr(scr));
   scr->setWidgetResizable(true);
   scr->setFrameShape(QFrame::Shape::Box);
   scr->setWidget(panel);
diff --git a/src/librssguard/gui/notifications/notificationseditor.cpp b/src/librssguard/gui/notifications/notificationseditor.cpp
index 3bb9aa68b..f786de410 100644
--- a/src/librssguard/gui/notifications/notificationseditor.cpp
+++ b/src/librssguard/gui/notifications/notificationseditor.cpp
@@ -8,13 +8,9 @@
 
 #include <QVBoxLayout>
 
-NotificationsEditor::NotificationsEditor(QWidget* parent) : QScrollArea(parent), m_layout(new QVBoxLayout(this)) {
+NotificationsEditor::NotificationsEditor(QWidget* parent) : QWidget(parent), m_layout(new QVBoxLayout(this)) {
   m_ui.setupUi(this);
-
-  QWidget* wdg = new QWidget(this);
-
-  wdg->setLayout(m_layout);
-  setWidget(wdg);
+  setLayout(m_layout);
 }
 
 void NotificationsEditor::loadNotifications(const QList<Notification>& notifications) {
diff --git a/src/librssguard/gui/notifications/notificationseditor.h b/src/librssguard/gui/notifications/notificationseditor.h
index 04f6a2db3..138f9f317 100644
--- a/src/librssguard/gui/notifications/notificationseditor.h
+++ b/src/librssguard/gui/notifications/notificationseditor.h
@@ -3,7 +3,7 @@
 #ifndef NOTIFICATIONSEDITOR_H
 #define NOTIFICATIONSEDITOR_H
 
-#include <QScrollArea>
+#include <QWidget>
 
 #include "ui_notificationseditor.h"
 
@@ -11,7 +11,7 @@
 
 class QVBoxLayout;
 
-class NotificationsEditor : public QScrollArea {
+class NotificationsEditor : public QWidget {
   Q_OBJECT
 
   public:
diff --git a/src/librssguard/gui/notifications/notificationseditor.ui b/src/librssguard/gui/notifications/notificationseditor.ui
index 71670ee37..4901a61b4 100644
--- a/src/librssguard/gui/notifications/notificationseditor.ui
+++ b/src/librssguard/gui/notifications/notificationseditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NotificationsEditor</class>
- <widget class="QScrollArea" name="NotificationsEditor">
+ <widget class="QWidget" name="NotificationsEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,12 +10,6 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::NoFrame</enum>
-  </property>
-  <property name="widgetResizable">
-   <bool>true</bool>
-  </property>
  </widget>
  <resources/>
  <connections/>
diff --git a/src/librssguard/gui/settings/settingsshortcuts.ui b/src/librssguard/gui/settings/settingsshortcuts.ui
index e4b6b4e80..c5a9bad38 100644
--- a/src/librssguard/gui/settings/settingsshortcuts.ui
+++ b/src/librssguard/gui/settings/settingsshortcuts.ui
@@ -12,41 +12,7 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <widget class="QScrollArea" name="m_scrollShortcuts">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="m_scrollShortcutsContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>767</width>
-        <height>508</height>
-       </rect>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="DynamicShortcutsWidget" name="m_shortcuts" native="true"/>
-       </item>
-      </layout>
-     </widget>
-    </widget>
+    <widget class="DynamicShortcutsWidget" name="m_shortcuts" native="true"/>
    </item>
   </layout>
  </widget>