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

Re-enable resizing of mode-specific colors

Browse source
This commit is contained in:
Adam Honse 2023-05-24 22:41:20 -05:00
parent e2dbe292a1
commit d0ccd9f746
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt/OpenRGBDevicePage.cpp
View file

@ -1513,7 +1513,7 @@ void Ui::OpenRGBDevicePage::on_EditZoneButton_clicked()
}
}
break;
#if 0
case MODE_COLORS_MODE_SPECIFIC:
{
OpenRGBZoneResizeDialog dlg(device->modes[device->active_mode].colors_min,
@ -1531,7 +1531,6 @@ void Ui::OpenRGBDevicePage::on_EditZoneButton_clicked()
UpdateMode();
}
break;
#endif
}
}

29
qt/OpenRGBZoneResizeDialog.cpp
View file

@ -50,6 +50,33 @@ OpenRGBZoneResizeDialog::OpenRGBZoneResizeDialog(RGBController* edit_dev_ptr, un
}
}
OpenRGBZoneResizeDialog::OpenRGBZoneResizeDialog(unsigned int edit_zone_min_val, unsigned int edit_zone_max_val, unsigned int edit_zone_current_val, QWidget *parent) :
QDialog(parent),
ui(new Ui::OpenRGBZoneResizeDialogUi)
{
/*-----------------------------------------------------*\
| This constructor does not use a device pointer. |
\*-----------------------------------------------------*/
edit_dev = NULL;
ui->setupUi(this);
/*-----------------------------------------------------*\
| This constructor is used for resizing mode-specific |
| colors. Segments are not used in this mode, so hide |
| the Segments tree view and buttons. |
\*-----------------------------------------------------*/
ui->SegmentsTreeWidget->hide();
ui->AddSegmentButton->hide();
ui->RemoveSegmentButton->hide();
ui->ResizeSlider->setRange(edit_zone_min_val, edit_zone_max_val);
ui->ResizeBox->setRange(edit_zone_min_val, edit_zone_max_val);
ui->ResizeSlider->setValue(edit_zone_current_val);
ui->ResizeBox->setValue(edit_zone_current_val);
}
OpenRGBZoneResizeDialog::~OpenRGBZoneResizeDialog()
{
delete ui;
@ -144,7 +171,7 @@ int Ui::OpenRGBZoneResizeDialog::show()
ret_val = ui->ResizeBox->value();
}
if(ret_val >= 0)
if(ret_val >= 0 && edit_dev != NULL)
{
edit_dev->ResizeZone(edit_zone_idx, ret_val);

1
qt/OpenRGBZoneResizeDialog.h
View file

@ -16,6 +16,7 @@ class Ui::OpenRGBZoneResizeDialog : public QDialog
public:
explicit OpenRGBZoneResizeDialog(RGBController* edit_dev_ptr, unsigned int edit_zone_idx_val, QWidget *parent = nullptr);
explicit OpenRGBZoneResizeDialog(unsigned int edit_zone_min_val, unsigned int edit_zone_max_val, unsigned int edit_zone_current_val, QWidget *parent = nullptr);
~OpenRGBZoneResizeDialog();
int show();