From 87a99e50dcd8249a1ba633dc32de607d8b131dd1 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Mon, 9 Aug 2021 22:19:19 -0400 Subject: [PATCH] Sync state of video overlay Qt widgets in a periodic update to ensure that hot key functions do not get window out of sync with state. --- src/drivers/Qt/ConsoleVideoConf.cpp | 17 +++++++++++++++++ src/drivers/Qt/ConsoleVideoConf.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/drivers/Qt/ConsoleVideoConf.cpp b/src/drivers/Qt/ConsoleVideoConf.cpp index a31e3472..4ac48a12 100644 --- a/src/drivers/Qt/ConsoleVideoConf.cpp +++ b/src/drivers/Qt/ConsoleVideoConf.cpp @@ -527,6 +527,12 @@ void ConsoleVideoConfDialog_t::periodicUpdate(void) regionSelect->setCurrentIndex(actRegion); } + setComboBoxFromValue( inputDisplaySel, input_display ); + + showFrameCount_cbx->setChecked( frame_display ); + showLagCount_cbx->setChecked( lagCounterDisplay ); + showRerecordCount_cbx->setChecked( rerecord_display ); + // Update Window Size Readouts updateReadouts(); } @@ -668,6 +674,17 @@ void ConsoleVideoConfDialog_t::setComboBoxFromProperty( QComboBox *cbx, const c } } //---------------------------------------------------- +void ConsoleVideoConfDialog_t::setComboBoxFromValue( QComboBox *cbx, int pval ) +{ + for (int i=0; icount(); i++) + { + if ( pval == cbx->itemData(i).toInt() ) + { + cbx->setCurrentIndex(i); break; + } + } +} +//---------------------------------------------------- void ConsoleVideoConfDialog_t::openGL_linearFilterChanged( int value ) { bool opt = (value != Qt::Unchecked); diff --git a/src/drivers/Qt/ConsoleVideoConf.h b/src/drivers/Qt/ConsoleVideoConf.h index 21bd2904..58c1f793 100644 --- a/src/drivers/Qt/ConsoleVideoConf.h +++ b/src/drivers/Qt/ConsoleVideoConf.h @@ -67,6 +67,7 @@ class ConsoleVideoConfDialog_t : public QDialog void setCheckBoxFromProperty( QCheckBox *cbx, const char *property ); void setComboBoxFromProperty( QComboBox *cbx, const char *property ); + void setComboBoxFromValue( QComboBox *cbx, int pval ); //void setSliderFromProperty( QSlider *slider, QLabel *lbl, const char *property ); void resetVideo(void);