creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-15 04:40:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into 'dev'

Browse Source 
Fixed the Linux color picker and system dialog bugs

See merge request creyd/intelliphoto!20
This commit is contained in:
Conrad
2019-12-18 12:55:56 +00:00
parent f268bf584d 3ad975a297
commit 38f89f30f9
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Layer/PaintingArea.cpp
View File

@@ -164,12 +164,12 @@ void PaintingArea::slotActivateLayer(int a){
}
void PaintingArea::colorPickerSetFirstColor(){
QColor clr = QColorDialog::getColor(colorPicker.getFirstColor(), nullptr, "Main Color");
QColor clr = QColorDialog::getColor(colorPicker.getFirstColor(), nullptr, "Main Color", QColorDialog::DontUseNativeDialog);
this->colorPicker.setFirstColor(clr);
}
void PaintingArea::colorPickerSetSecondColor(){
QColor clr = QColorDialog::getColor(colorPicker.getSecondColor(), nullptr, "Secondary Color");
QColor clr = QColorDialog::getColor(colorPicker.getSecondColor(), nullptr, "Secondary Color", QColorDialog::DontUseNativeDialog);
this->colorPicker.setSecondColor(clr);
}

4
src/Layer/PaintingArea.h
View File

@@ -21,8 +21,6 @@ struct LayerObject{
int widthOffset;
int hightOffset;
int alpha=255;
};
class PaintingArea : public QWidget
@@ -83,7 +81,6 @@ private:
void activateUpperLayer();
void activateLowerLayer();
QImage* Canvas;
int maxWidth;
int maxHeight;
@@ -104,4 +101,3 @@ private:
};
#endif