songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug with Wayland

This commit is contained in:
Laurent Rineau 2025-04-03 16:12:40 +02:00
parent ac003e54ec
commit f992865fba
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Lab/demo/Lab/Viewer.cpp
View File

@ -36,6 +36,8 @@
#endif #endif
#define ORIGINAL_FOV 0.94853805396568136 #define ORIGINAL_FOV 0.94853805396568136
class QWidget;
class Viewer_impl { class Viewer_impl {
public: public:
CGAL::Three::Scene_draw_interface* scene; CGAL::Three::Scene_draw_interface* scene;
@ -138,7 +140,11 @@ class LightingDialog :
Q_OBJECT Q_OBJECT
public: public:
QColor ambient, diffuse, specular; QColor ambient, diffuse, specular;
LightingDialog(Viewer_impl* d) LightingDialog(QWidget* parent, Viewer_impl* d)
: QDialog(parent)
, diffuse_dial(this)
, ambient_dial(this)
, spec_dial(this)
{ {
setupUi(this); setupUi(this);
position_lineEdit->setText(QString("%1,%2,%3") position_lineEdit->setText(QString("%1,%2,%3")
@ -172,33 +178,23 @@ public:
connect(&diffuse_dial, &QColorDialog::currentColorChanged, this, &LightingDialog::diffuse_changed ); connect(&diffuse_dial, &QColorDialog::currentColorChanged, this, &LightingDialog::diffuse_changed );
connect(&spec_dial, &QColorDialog::currentColorChanged, this, &LightingDialog::specular_changed); connect(&spec_dial, &QColorDialog::currentColorChanged, this, &LightingDialog::specular_changed);
auto apply_color_change = [](QColor* color, QColorDialog* dialog, QPushButton* button) {
return [=] {
dialog->setCurrentColor(*color);
dialog->exec();
*color = dialog->selectedColor();
QPalette palette;
palette.setColor(QPalette::Button, *color);
button->setPalette(palette);
};
};
connect(ambientButton, &QPushButton::clicked, connect(ambientButton, &QPushButton::clicked,
[this](){ apply_color_change(&ambient, &ambient_dial, ambientButton));
ambient_dial.setCurrentColor(ambient);
ambient_dial.exec();
ambient = ambient_dial.selectedColor();
QPalette palette;
palette.setColor(QPalette::Button, ambient);
ambientButton->setPalette(palette);
});
connect(diffuseButton, &QPushButton::clicked, connect(diffuseButton, &QPushButton::clicked,
[this](){ apply_color_change(&diffuse, &diffuse_dial, diffuseButton));
diffuse_dial.setCurrentColor(diffuse);
diffuse_dial.exec();
diffuse = diffuse_dial.selectedColor();
QPalette palette;
palette.setColor(QPalette::Button, diffuse);
diffuseButton->setPalette(palette);
});
connect(specularButton, &QPushButton::clicked, connect(specularButton, &QPushButton::clicked,
[this](){ apply_color_change(&specular, &spec_dial, specularButton));
spec_dial.setCurrentColor(specular);
spec_dial.exec();
specular = spec_dial.selectedColor();
QPalette palette;
palette.setColor(QPalette::Button, specular);
specularButton->setPalette(palette);
});
//D e f a u l t - S e t t i n g s //D e f a u l t - S e t t i n g s
connect(buttonBox->button(QDialogButtonBox::StandardButton::RestoreDefaults), &QPushButton::clicked, connect(buttonBox->button(QDialogButtonBox::StandardButton::RestoreDefaults), &QPushButton::clicked,
@ -1821,7 +1817,7 @@ void Viewer::setLighting()
QVector4D prev_diffuse = d->diffuse; QVector4D prev_diffuse = d->diffuse;
QVector4D prev_spec_color = d->specular; QVector4D prev_spec_color = d->specular;
//open dialog //open dialog
LightingDialog* dialog = new LightingDialog(d); LightingDialog* dialog = new LightingDialog(this->parentWidget(), d);
//set specular //set specular
connect(dialog->spec_powrSlider, &QSlider::valueChanged, connect(dialog->spec_powrSlider, &QSlider::valueChanged,
[this, dialog]() [this, dialog]()