From 7c46d99bc3824ec7b761d3ff84a5971651345d7c Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 5 Oct 2023 10:55:28 -0400
Subject: [PATCH] 2023-10-05 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed a regression in rdairplay(1) and rdpanel(1) that caused 	extraneous
 buttons to appear when resizing the sound panel.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog              |  3 +++
 lib/rdbutton_panel.cpp | 16 ++++++++++++----
 lib/rdbutton_panel.h   |  1 +
 lib/rdpanel_button.cpp |  1 -
 lib/rdsound_panel.cpp  |  8 +-------
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 426a42a5..48770d36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24414,3 +24414,6 @@
 2023-10-05 Fred Gleason <fredg@paravelsystems.com>
 	* Clarified the entries for the 'Pause Panel' ['PU'] and
 	'Stop Panel' ['PT'] RMLs in the Operations Guide.
+2023-10-05 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression in rdairplay(1) and rdpanel(1) that caused
+	extraneous buttons to appear when resizing the sound panel.
diff --git a/lib/rdbutton_panel.cpp b/lib/rdbutton_panel.cpp
index 0fac2941..0208d655 100644
--- a/lib/rdbutton_panel.cpp
+++ b/lib/rdbutton_panel.cpp
@@ -257,13 +257,15 @@ QString RDButtonPanel::json(int padding,bool final) const
 
 void RDButtonPanel::setVisible(bool state)
 {
-  printf("Calling RDButtonPanel::setVisible(%d) @ %p\n",state,this);
   RDWidget::setVisible(state);
   for(int i=0;i<PANEL_MAX_BUTTON_ROWS;i++) {
     for(int j=0;j<PANEL_MAX_BUTTON_COLUMNS;j++) {
       panel_button[i][j]->setVisible(state);
     }
   }
+  if(state) {
+    UpdateViewport();
+  }
 }
 
 
@@ -271,9 +273,9 @@ void RDButtonPanel::buttonClickedData(int id)
 {
   int pnum=id/(PANEL_MAX_BUTTON_COLUMNS*PANEL_MAX_BUTTON_ROWS);
   int pos=id%(PANEL_MAX_BUTTON_COLUMNS*PANEL_MAX_BUTTON_ROWS);
-  printf("emitting buttonClicked(%d,%d,%d)\n",
-	 pnum,pos%PANEL_MAX_BUTTON_COLUMNS,pos/PANEL_MAX_BUTTON_COLUMNS);
-  emit buttonClicked(pnum,pos%PANEL_MAX_BUTTON_COLUMNS,pos/PANEL_MAX_BUTTON_COLUMNS);
+
+  emit buttonClicked(pnum,pos%PANEL_MAX_BUTTON_COLUMNS,
+		     pos/PANEL_MAX_BUTTON_COLUMNS);
 }
 
 
@@ -287,6 +289,12 @@ void RDButtonPanel::resizeEvent(QResizeEvent *e)
 				      PANEL_BUTTON_SIZE_Y);
     }
   }
+  UpdateViewport();
+}
+
+
+void RDButtonPanel::UpdateViewport()
+{
   for(int i=0;i<PANEL_MAX_BUTTON_ROWS;i++) {
     for(int j=0;j<PANEL_MAX_BUTTON_COLUMNS;j++) {
       RDPanelButton *button=panel_button[i][j];
diff --git a/lib/rdbutton_panel.h b/lib/rdbutton_panel.h
index 114e8901..a10d39d4 100644
--- a/lib/rdbutton_panel.h
+++ b/lib/rdbutton_panel.h
@@ -70,6 +70,7 @@ class RDButtonPanel : public RDWidget
   void resizeEvent(QResizeEvent *e);
 
  private:
+  void UpdateViewport();
   int panel_number;
   QString panel_title;
   QSignalMapper *panel_button_mapper;
diff --git a/lib/rdpanel_button.cpp b/lib/rdpanel_button.cpp
index 17ef9f50..e94d10d2 100644
--- a/lib/rdpanel_button.cpp
+++ b/lib/rdpanel_button.cpp
@@ -18,7 +18,6 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-
 #include <QDrag>
 #include <QPainter>
 
diff --git a/lib/rdsound_panel.cpp b/lib/rdsound_panel.cpp
index 10c0cb32..19b9639f 100644
--- a/lib/rdsound_panel.cpp
+++ b/lib/rdsound_panel.cpp
@@ -673,7 +673,6 @@ void RDSoundPanel::panelDown()
 
 void RDSoundPanel::panelActivatedData(int n)
 {
-  printf("panelActivatedData(%d)\n",n);
   QString username;
   if(panel_type==RDAirPlayConf::UserPanel) {
     username=rda->user()->name();
@@ -754,8 +753,6 @@ void RDSoundPanel::setupClickedData()
 
 void RDSoundPanel::buttonClickedData(int pnum,int col,int row)
 {
-  //  printf("buttonMapperData(pnum: %d,col: %d  row: %d)\n",pnum,col,row);
-
   if(panel_current_panel==NULL) {
     printf("NO CURRENT PANEL!\n");
     return;
@@ -1300,9 +1297,7 @@ void RDSoundPanel::UpdatePanels(const QString &username)
     }
     for(int i=panel_arrays.value(username).size();i<max_panels;i++) {
       RDButtonPanel *panel=new RDButtonPanel(type,i,this);
-      printf("new panel  type: %d  number: %d  ptr: %p\n",
-	     type,i,panel);
-      
+      panel->setGeometry(0,0,size().width()-5,size().height()-60);
       connect(panel,SIGNAL(buttonClicked(int,int,int)),
 	      this,SLOT(buttonClickedData(int,int,int)));
       panel->hide();
@@ -1379,7 +1374,6 @@ void RDSoundPanel::ShowPanel(RDAirPlayConf::PanelType type,int offset)
   if(type==RDAirPlayConf::UserPanel) {
     username=rda->user()->name();
   }
-  printf("username: %s\n",username.toUtf8().constData());
   if(panel_arrays.value(username).size()>offset) {
     if(panel_current_panel!=NULL) {
       panel_current_panel->hide();