From fed0e9bf2015f71558cf8f8c27dee34c8b4221d4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 31 Dec 2017 12:38:48 +0000
Subject: [PATCH] Revert "UI: make the layout scrollable when there are many
 buttons"

This reverts commit 0957dc3850be3505168886a97860ba49478d3676.

The scroll area adds ugly scroll bars to the button configuration part of the widget.
---
 src/layout_edit.cpp | 5 +----
 src/layout_edit.h   | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/layout_edit.cpp b/src/layout_edit.cpp
index aae34fe..2e13b8d 100644
--- a/src/layout_edit.cpp
+++ b/src/layout_edit.cpp
@@ -95,12 +95,9 @@ LayoutEdit::LayoutEdit( LayoutManager* l )
     mainLayout->addWidget( joyButtons );
     
     //we have a WidgetStack to represent the multiple joypads
-    padScroll = new QScrollArea(this);
-    padScroll->setWidgetResizable(true);
-    mainLayout->addWidget(padScroll);
     padStack = new QStackedWidget( this );
     padStack->setFrameStyle(QFrame::Box | QFrame::Sunken );
-    padScroll->setWidget(padStack);
+    mainLayout->addWidget(padStack);
 
     //go through each of the available joysticks
     // i is the current index into PadStack
diff --git a/src/layout_edit.h b/src/layout_edit.h
index e3b37fb..7450877 100644
--- a/src/layout_edit.h
+++ b/src/layout_edit.h
@@ -1,7 +1,6 @@
 #ifndef QJOYPAD_LAYOUT_EDIT_H
 #define QJOYPAD_LAYOUT_EDIT_H
 
-#include <QScrollArea>
 #include <QStackedWidget>
 
 //for the tab list of joypads
@@ -34,7 +33,6 @@ class LayoutEdit : public QWidget {
         LayoutManager* lm;
 		//parts of the dialog:
         QVBoxLayout *mainLayout;
-        QScrollArea *padScroll;
         QStackedWidget *padStack;
         FlashRadioArray *joyButtons;
         QComboBox* cmbLayouts;