jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework OpenRGBDialog rescan behavior to update UI when rescan is triggered outside of the UI

Browse source
This commit is contained in:
Adam Honse 2025-07-04 00:22:08 -05:00
parent 38afb8b8eb
commit 6d981e21ff
2 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
qt/OpenRGBDialog/OpenRGBDialog.cpp
View file

@ -150,6 +150,13 @@ static void DeletePluginCallback(void * this_ptr, OpenRGBPluginEntry* plugin)
this_obj->RemovePlugin(plugin);
}
static void DetectionStartedCallback(void * this_ptr)
{
OpenRGBDialog * this_obj = (OpenRGBDialog *)this_ptr;
QMetaObject::invokeMethod(this_obj, "onDetectionStarted", Qt::QueuedConnection);
}
static void DetectionEndedCallback(void * this_ptr)
{
OpenRGBDialog * this_obj = (OpenRGBDialog *)this_ptr;
@ -165,7 +172,6 @@ static void DialogShowCallback(void * this_ptr, PLogMessage msg)
QMetaObject::invokeMethod(this_obj, "onShowDialogMessage", Qt::QueuedConnection);
}
bool OpenRGBDialog::IsMinimizeOnClose()
{
json ui_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("UserInterface");
@ -306,6 +312,7 @@ OpenRGBDialog::OpenRGBDialog(QWidget *parent) : QMainWindow(parent), ui(new Ui::
\*-----------------------------------------------------*/
ResourceManager::get()->RegisterDetectionProgressCallback(UpdateDetectionProgressCallback, this);
ResourceManager::get()->RegisterDeviceListChangeCallback(UpdateDeviceListCallback, this);
ResourceManager::get()->RegisterDetectionStartCallback(DetectionStartedCallback, this);
ResourceManager::get()->RegisterDetectionEndCallback(DetectionEndedCallback, this);
/*-----------------------------------------------------*\
@ -1294,6 +1301,26 @@ void OpenRGBDialog::onDetectionProgressUpdated()
}
}
void OpenRGBDialog::onDetectionStarted()
{
/*---------------------------------------------------------*\
| Hide devices view on rescan so it stops handling paint |
| events. |
| Memorize previous value of device_view_showing and |
| restore it. |
\*---------------------------------------------------------*/
bool device_view_showing_prev = device_view_showing;
HideLEDView();
device_view_showing = device_view_showing_prev;
/*---------------------------------------------------------*\
| Show the detection progress bar. |
\*---------------------------------------------------------*/
SetDetectionViewState(true);
}
void OpenRGBDialog::onDetectionEnded()
{
/*-------------------------------------------------------*\
@ -1686,23 +1713,6 @@ void OpenRGBDialog::SaveProfileAs()
void OpenRGBDialog::on_ButtonRescan_clicked()
{
/*---------------------------------------------------------*\
| Hide devices view on rescan so it stops handling paint |
| events. |
| Memorize previous value of device_view_showing and |
| restore it. |
\*---------------------------------------------------------*/
bool device_view_showing_prev = device_view_showing;
HideLEDView();
device_view_showing = device_view_showing_prev;
/*---------------------------------------------------------*\
| Show the detection progress bar. |
\*---------------------------------------------------------*/
SetDetectionViewState(true);
/*---------------------------------------------------------*\
| Show the detection progress bar. |
\*---------------------------------------------------------*/

1
qt/OpenRGBDialog/OpenRGBDialog.h
View file

@ -148,6 +148,7 @@ private slots:
void on_QuickWhite();
void onDeviceListUpdated();
void onDetectionProgressUpdated();
void onDetectionStarted();
void onDetectionEnded();
void on_SetAllDevices(unsigned char red, unsigned char green, unsigned char blue);
void on_SaveSizeProfile();