Skip to content
Permalink
Browse files

fix and bring back scroll area into custom widgets

  • Loading branch information
3nids committed Oct 6, 2017
1 parent 2d484db commit 5dce8edb95fc2432dedcac3d860bd5d46b16a436
@@ -36,7 +36,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
qgsrelationreferencewidgetplugin.cpp
qgsscalerangewidgetplugin.cpp
qgsscalewidgetplugin.cpp
# qgsscrollareawidgetplugin.cpp
qgsscrollareawidgetplugin.cpp
qgsspinboxplugin.cpp
qgssymbolbuttonplugin.cpp
)
@@ -67,7 +67,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
qgsrelationreferencewidgetplugin.h
qgsscalerangewidgetplugin.h
qgsscalewidgetplugin.h
# qgsscrollareawidgetplugin.h
qgsscrollareawidgetplugin.h
qgsspinboxplugin.h
qgssymbolbuttonplugin.h
)
@@ -40,7 +40,7 @@
#include "qgsrelationreferencewidgetplugin.h"
#include "qgsscalerangewidgetplugin.h"
#include "qgsscalewidgetplugin.h"
//#include "qgsscrollareawidgetplugin.h"
#include "qgsscrollareawidgetplugin.h"
#include "qgsspinboxplugin.h"
#include "qgssymbolbuttonplugin.h"

@@ -71,7 +71,7 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
mWidgets.append( new QgsRelationReferenceWidgetPlugin( this ) );
mWidgets.append( new QgsScaleRangeWidgetPlugin( this ) );
mWidgets.append( new QgsScaleWidgetPlugin( this ) );
// mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) ); // this is causing troubles at the moment
mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) );
mWidgets.append( new QgsSpinBoxPlugin( this ) );
mWidgets.append( new QgsSymbolButtonPlugin( this ) );
}
@@ -89,6 +89,19 @@ QString QgsScrollAreaWidgetPlugin::domXml() const
" <height>100</height>\n"
" </rect>\n"
" </property>\n"
" <property name=\"widgetResizable\">\n"
" <bool>true</bool>\n"
" </property>\n"
" <widget class=\"QWidget\" name=\"scrollAreaWidgetContents\">\n"
" <property name=\"geometry\">\n"
" <rect>\n"
" <x>0</x>\n"
" <y>0</y>\n"
" <width>118</width>\n"
" <height>78</height>\n"
" </rect>\n"
" </property>\n"
" </widget>\n"
" </widget>\n"
"</ui>\n" )
.arg( name() );

0 comments on commit 5dce8ed

Please sign in to comment.
You can’t perform that action at this time.