Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-17 17:00:27 +02:00
Code Issues Projects Releases Wiki Activity

2023-06-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions that caused spontaneous resizing of the main
	window in rdairplay(1) when switching between Sound Panel and
	Voice Tracker views on the right-hand side.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-06-29 15:56:06 -04:00
parent c92b4dc703
commit 62b1e8a3a8
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24265,3 +24265,7 @@
* Added processuniqueness checks to caed(8), rdairplay(1),
rdrepld(8), rdrssd(8), rdservice(8), rdvairplayd(8), ripcd(8) and
rdalsaconfig(8).
2023-06-29 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions that caused spontaneous resizing of the main
window in rdairplay(1) when switching between Sound Panel and
Voice Tracker views on the right-hand side.

30
rdairplay/rdairplay.cpp
View File

@ -716,7 +716,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
QSize MainWidget::sizeHint() const
{
return QSize(1555,870);
return QSize(1310,870);
}
@ -1319,7 +1319,7 @@ void MainWidget::fullLogButtonData(int id)
}
else {
air_panel->hide();
ShowTracker(false);
air_tracker->hide();
air_tracker_button->setPalette(palette());
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
if(air_log_list[i]->isVisible()) {
@ -1344,7 +1344,7 @@ void MainWidget::panelButtonData()
air_log_button[i]->setPalette(palette());
}
}
ShowTracker(false);
air_tracker->hide();
air_tracker_button->setPalette(palette());
air_panel->show();
air_panel_button->setPalette(active_color);
@ -1361,7 +1361,7 @@ void MainWidget::trackerButtonData()
}
air_panel->hide();
air_panel_button->setPalette(palette());
ShowTracker(true);
air_tracker->show();
air_tracker_button->setPalette(active_color);
}
@ -1841,15 +1841,11 @@ void MainWidget::resizeEvent(QResizeEvent *e)
int xpos=562;
air_panel_button->setGeometry(xpos,h-65,80,60);
xpos+=85;
if((size().width()>=(510+air_tracker->sizeHint().width()))&&
(h>=(140+air_tracker->sizeHint().height()))) {
air_tracker_button->setGeometry(xpos,h-65,80,60);
xpos+=85;
air_tracker_button->show();
}
else {
air_tracker_button->hide();
}
int log_button_w=(w-xpos-5)/3;
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_log_button[i]->setGeometry(xpos+i*log_button_w,h-65,log_button_w-5,60);
@ -2253,20 +2249,6 @@ RDAirPlayConf::Channel MainWidget::PanelChannel(int mport) const
}
void MainWidget::ShowTracker(bool state)
{
if(state) {
setMinimumWidth(510+air_tracker->sizeHint().width());
setMinimumHeight(140+air_tracker->sizeHint().height());
air_tracker->show();
}
else {
setMinimumSize(sizeHint());
air_tracker->hide();
}
}
void MainWidget::LoadMeters()
{
QString sql;

1
rdairplay/rdairplay.h
View File

@ -103,7 +103,6 @@ class MainWidget : public RDMainWindow
bool AssertChannelLock(int dir,int card,int port);
bool AssertChannelLock(int dir,int achan);
int AudioChannel(int card,int port) const;
void ShowTracker(bool state);
void LoadMeters();
RDAirPlayConf::Channel PanelChannel(int mport) const;
RDLogPlay *air_log[RDAIRPLAY_LOG_QUANTITY];