From 9be0776d328515413288385d1ba017e730315ba4 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 26 Apr 2022 19:44:14 +0200
Subject: [PATCH] Massive UI revamping (v7): unify top bar size to 22px and
correct the getAdditionaHeight methods. Part of #1209
---
sdrgui/channel/channelgui.h | 2 +-
sdrgui/device/devicegui.cpp | 1 +
sdrgui/device/devicegui.h | 2 +-
sdrgui/feature/featuregui.h | 2 +-
sdrgui/mainspectrum/mainspectrumgui.cpp | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sdrgui/channel/channelgui.h b/sdrgui/channel/channelgui.h
index d05b71f36..b1f3d7bdc 100644
--- a/sdrgui/channel/channelgui.h
+++ b/sdrgui/channel/channelgui.h
@@ -95,7 +95,7 @@ protected:
void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
void updateIndexLabel();
- int getAdditionalHeight() const { return 25 + 22; }
+ int getAdditionalHeight() const { return 22 + 22; }
void setHighlighted(bool highlighted);
DeviceType m_deviceType;
diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp
index eefa2355b..19f4a8e15 100644
--- a/sdrgui/device/devicegui.cpp
+++ b/sdrgui/device/devicegui.cpp
@@ -54,6 +54,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) :
m_indexLabel->setToolTip("Device type and set index");
m_settingsButton = new QPushButton();
+ m_settingsButton->setFixedSize(20, 20);
QIcon settingsIcon(":/gear.png");
m_settingsButton->setIcon(settingsIcon);
m_settingsButton->setToolTip("Common settings");
diff --git a/sdrgui/device/devicegui.h b/sdrgui/device/devicegui.h
index 1417ca8a8..a615e2643 100644
--- a/sdrgui/device/devicegui.h
+++ b/sdrgui/device/devicegui.h
@@ -83,7 +83,7 @@ protected:
void mouseReleaseEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
- int getAdditionalHeight() const { return 25 + 22; }
+ int getAdditionalHeight() const { return 22 + 22; }
DeviceType m_deviceType;
int m_deviceSetIndex;
diff --git a/sdrgui/feature/featuregui.h b/sdrgui/feature/featuregui.h
index fbccad7b6..7e80d30ef 100644
--- a/sdrgui/feature/featuregui.h
+++ b/sdrgui/feature/featuregui.h
@@ -72,7 +72,7 @@ protected:
void mouseReleaseEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
- int getAdditionalHeight() const { return 25 + 22; }
+ int getAdditionalHeight() const { return 22 + 22; }
int m_featureIndex;
QString m_helpURL;
diff --git a/sdrgui/mainspectrum/mainspectrumgui.cpp b/sdrgui/mainspectrum/mainspectrumgui.cpp
index dfc44d99e..55de3a1f0 100644
--- a/sdrgui/mainspectrum/mainspectrumgui.cpp
+++ b/sdrgui/mainspectrum/mainspectrumgui.cpp
@@ -97,7 +97,7 @@ MainSpectrumGUI::MainSpectrumGUI(GLSpectrum *spectrum, GLSpectrumGUI *spectrumGU
// m_statusLabel->setToolTip("Spectrum status");
m_layouts = new QVBoxLayout();
- m_layouts->setContentsMargins(m_resizer.m_gripSize, 4, m_resizer.m_gripSize, 4);
+ m_layouts->setContentsMargins(m_resizer.m_gripSize, m_resizer.m_gripSize, m_resizer.m_gripSize, m_resizer.m_gripSize);
m_layouts->setSpacing(0);
m_topLayout = new QHBoxLayout();