VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-03 21:20:31 -05:00
Code Issues Projects Releases Wiki Activity

Fixed select device stream dialog window placement

Browse Source
This commit is contained in:
f4exb 2019-05-21 14:12:32 +02:00
parent 222005c189
commit 319c988ef9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdrgui/gui/devicestreamselectiondialog.cpp
View File

@ -22,10 +22,10 @@
DeviceStreamSelectionDialog::DeviceStreamSelectionDialog(QWidget *parent) : DeviceStreamSelectionDialog::DeviceStreamSelectionDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::DeviceStreamSelectionDialog), ui(new Ui::DeviceStreamSelectionDialog),
m_hasChanged(false), m_hasChanged(false)
m_streamIndex(0)
{ {
ui->setupUi(this); ui->setupUi(this);
setStreamIndex(0);
} }
DeviceStreamSelectionDialog::~DeviceStreamSelectionDialog() DeviceStreamSelectionDialog::~DeviceStreamSelectionDialog()

4
sdrgui/gui/devicestreamselectiondialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>360</width>
<height>135</height> <height>72</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">

8
sdrgui/gui/rollupwidget.cpp
View File

@ -119,11 +119,11 @@ int RollupWidget::arrangeRollups()
for(int i = 0; i < children().count(); ++i) for(int i = 0; i < children().count(); ++i)
{ {
QWidget* r = qobject_cast<QWidget*>(children()[i]); QWidget* r = qobject_cast<QWidget*>(children()[i]);
if(r != NULL) if (r != nullptr)
{ {
pos += fm.height() + 2; pos += fm.height() + 2;
if(!r->isHidden() && (r->windowTitle() != "Basic channel settings")) if (!r->isHidden() && (r->windowTitle() != "Basic channel settings") && (r->windowTitle() != "Select device stream"))
{ {
r->move(2, pos + 3); r->move(2, pos + 3);
int h = 0; int h = 0;
@ -241,7 +241,9 @@ void RollupWidget::paintEvent(QPaintEvent*)
int RollupWidget::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame) int RollupWidget::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame)
{ {
if (rollup->windowTitle() == "Basic channel settings") return 0; if ((rollup->windowTitle() == "Basic channel settings") || (rollup->windowTitle() == "Select device stream")) {
return 0;
}
QFontMetrics fm(font()); QFontMetrics fm(font());
int height = 1; int height = 1;