r24291 by jghali - #16352: Fix another set of non transparent scrollareas in preferences dialog <bubu>

scribus-commit scribus-commit at lists.scribus.net
Thu Nov 26 13:20:48 UTC 2020


Author: jghali
Date: Thu Nov 26 13:20:48 2020
New Revision: 24291

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24291
Log:
#16352: Fix another set of non transparent scrollareas in preferences dialog <bubu>

Modified:
    trunk/Scribus/scribus/ui/prefs_display.cpp
    trunk/Scribus/scribus/ui/prefs_displaybase.ui
    trunk/Scribus/scribus/ui/prefs_documentinformation.cpp
    trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui

Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24291&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp	Thu Nov 26 13:20:48 2020
@@ -18,12 +18,15 @@
 #include "scribusdoc.h"
 #include "units.h"
 
-Prefs_Display::Prefs_Display(QWidget* parent, ScribusDoc* doc) : Prefs_Pane(parent), m_doc(doc)
-{
-	setupUi(this);
-	languageChange();
-
-	m_caption = tr("Display");
+Prefs_Display::Prefs_Display(QWidget* parent, ScribusDoc* doc) : Prefs_Pane(parent), m_doc(doc)
+{
+	setupUi(this);
+	scrollArea->viewport()->setAutoFillBackground(false);
+	scrollArea->widget()->setAutoFillBackground(false);
+
+	languageChange();
+
+	m_caption = tr("Display");
 	m_icon = "16/video-display.png";
 
 	buttonRestoreDPI->setIcon(IconManager::instance().loadIcon("screen.png"));

Modified: trunk/Scribus/scribus/ui/prefs_displaybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24291&path=/trunk/Scribus/scribus/ui/prefs_displaybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_displaybase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_displaybase.ui	Thu Nov 26 13:20:48 2020
@@ -360,6 +360,12 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QScrollArea" name="scrollArea">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Plain</enum>
+         </property>
          <property name="widgetResizable">
           <bool>true</bool>
          </property>
@@ -375,6 +381,18 @@
           <layout class="QFormLayout" name="formLayout_2">
            <property name="fieldGrowthPolicy">
             <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+           </property>
+           <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 row="0" column="0">
             <widget class="QLabel" name="label_15">

Modified: trunk/Scribus/scribus/ui/prefs_documentinformation.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24291&path=/trunk/Scribus/scribus/ui/prefs_documentinformation.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentinformation.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentinformation.cpp	Thu Nov 26 13:20:48 2020
@@ -13,6 +13,9 @@
 	: Prefs_Pane(parent)
 {
 	setupUi(this);
+	scrollArea->viewport()->setAutoFillBackground(false);
+	scrollArea->widget()->setAutoFillBackground(false);
+
 	languageChange();
 
 	m_caption = tr("Document Information");

Modified: trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24291&path=/trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui	Thu Nov 26 13:20:48 2020
@@ -127,12 +127,24 @@
             <y>0</y>
             <width>618</width>
             <height>567</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <item>
-            <layout class="QFormLayout" name="formLayout_2">
-             <item row="0" column="0">
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <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>
+            <layout class="QFormLayout" name="formLayout_2">
+             <item row="0" column="0">
               <widget class="QLabel" name="label_7">
                <property name="text">
                 <string>Publisher:</string>




More information about the scribus-commit mailing list