Skip to content

Commit

Permalink
Fixed layout issues on Windows with "Font scaling" set to 150%.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SBriere
SBriere committed Feb 9, 2021
1 parent 5e360f5 commit 07f4f98
Show file tree
Hide file tree
Showing 9 changed files with 428 additions and 293 deletions.
6 changes: 5 additions & 1 deletion client/resources/stylesheet.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,11 @@ QToolButton#btnNextCal, QToolButton#btnPrevCal {
border-radius: 5px;
border: 2px solid rgb(186, 186, 186);
}

QPushButton#btnAddDevice, QPushButton#btnDelDevice{
min-width: 0px;
}

QFrame#frameCheckSessionTypes{
background-color: black;
}
Expand Down Expand Up @@ -630,7 +635,6 @@ QFrame#frameInvitees{
background-color: rgba(0,0,100,50%);
}

/* Customizations for ParticipantWidget */
QPushButton#btnFilterSessionsTypes:checked{
color:white;
background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgb(100,100,100), stop: 0.2 black, stop:1 rgb(100,100,100));
Expand Down
48 changes: 41 additions & 7 deletions client/src/ConfigWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,48 @@ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
</widget>
</item>
<item>
<widget class="QWidget" name="wdgEditor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="layoutEditor"/>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>575</width>
<height>443</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</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>
<widget class="QWidget" name="wdgEditor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="layoutEditor"/>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand Down
63 changes: 43 additions & 20 deletions client/src/MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,23 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QSplitter" name="splitter_4">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="wdgMainTop" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<widget class="QWidget" name="scrollAreaWidgetContents_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1050</width>
<height>736</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
Expand All @@ -58,6 +57,30 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="wdgMainTop" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<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>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down Expand Up @@ -210,7 +233,7 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
</property>
<property name="minimumSize">
<size>
<width>0</width>
<width>402</width>
<height>50</height>
</size>
</property>
Expand Down Expand Up @@ -719,7 +742,7 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
<property name="minimumSize">
<size>
<width>160</width>
<height>229</height>
<height>233</height>
</size>
</property>
<property name="features">
Expand Down Expand Up @@ -800,7 +823,7 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
<x>0</x>
<y>0</y>
<width>1689</width>
<height>20</height>
<height>25</height>
</rect>
</property>
</widget>
Expand Down
Loading

0 comments on commit 07f4f98

Please sign in to comment.