Revert "UI: make the layout scrollable when there are many buttons"

This reverts commit 0957dc3. The scroll area adds ugly scroll bars to the button configuration part of the dialog.
panzi · Dec 31, 2017 · 7444bf9 · 7444bf9
1 parent d7624c5
commit 7444bf9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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;