natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collapse custom brush Ui

Browse Source
This commit is contained in:
T1ti
2024-01-25 19:43:36 +01:00
parent 6718a5940c
commit 88bcbaa517
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/noggit/ui/ShaderTool.cpp
View File

@@ -92,13 +92,6 @@ namespace Noggit
_use_image_colors->setChecked(true);
layout->addRow("Use image colors", _use_image_colors);
_image_mask_group = new Noggit::Ui::Tools::ImageMaskSelector(map_view, this);
_image_mask_group->setContinuousActionName("Paint");
_image_mask_group->setBrushModeVisible(parent == map_view);
_image_mask_group->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum));
_mask_image = _image_mask_group->getPixmap()->toImage();
layout->addRow(_image_mask_group);
_color_palette = new color_widgets::ColorListWidget(this);
_color_palette->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
layout->addRow(_color_palette);
@@ -108,6 +101,19 @@ namespace Noggit
layout->addRow(info_label);
_image_mask_group = new Noggit::Ui::Tools::ImageMaskSelector(map_view, this);
_image_mask_group->setContinuousActionName("Paint");
_image_mask_group->setBrushModeVisible(parent == map_view);
_image_mask_group->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum));
_mask_image = _image_mask_group->getPixmap()->toImage();
// layout->addRow(_image_mask_group);
auto* customBrushBox = new ExpanderWidget(this);
customBrushBox->setExpanderTitle("Custom Brush");
customBrushBox->addPage(_image_mask_group);
customBrushBox->setExpanded(false);
layout->addRow(customBrushBox);
QObject::connect(_slide_saturation, &color_widgets::GradientSlider::valueChanged, this, &ShaderTool::set_hsv);
QObject::connect(_slide_value, &color_widgets::GradientSlider::valueChanged, this, &ShaderTool::set_hsv);
QObject::connect(_slide_hue, &color_widgets::HueSlider::valueChanged, this, &ShaderTool::set_hsv);

8
src/noggit/ui/TerrainTool.cpp
View File

@@ -128,9 +128,15 @@ namespace Noggit
_image_mask_group = new Noggit::Ui::Tools::ImageMaskSelector(map_view, this);
_mask_image = _image_mask_group->getPixmap()->toImage();
layout->addWidget(_image_mask_group);
// layout->addWidget(_image_mask_group);
_image_mask_group->setBrushModeVisible(!stamp);
auto* customBrushBox = new ExpanderWidget(this);
customBrushBox->setExpanderTitle("Custom Brush");
customBrushBox->addPage(_image_mask_group);
customBrushBox->setExpanded(false);
layout->addWidget(customBrushBox);
_vertex_type_group = new QGroupBox ("Vertex edit", this);
_vertex_type_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
QVBoxLayout* vertex_layout (new QVBoxLayout (_vertex_type_group));

8
src/noggit/ui/texturing_tool.cpp
View File

@@ -160,7 +160,13 @@ namespace Noggit
_image_mask_group->setBrushModeVisible(parent == map_view);
_mask_image = _image_mask_group->getPixmap()->toImage();
_image_mask_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
tool_layout->addWidget(_image_mask_group);
// tool_layout->addWidget(_image_mask_group);
auto* customBrushBox = new ExpanderWidget(this);
customBrushBox->setExpanderTitle("Custom Brush");
customBrushBox->addPage(_image_mask_group);
customBrushBox->setExpanded(false);
tool_layout->addWidget(customBrushBox);
tool_layout->setAlignment(_image_mask_group, Qt::AlignTop);
auto quick_palette_btn (new QPushButton("Quick Palette", this));