plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add QBrush as an argument to QPainter.setBrush

Browse Source
This commit is contained in:
Andreas Kröhnke 2021-10-14 13:12:54 +09:00 committed by Simon Edwards
parent 3bbb7da6e7
commit 47c00fabc1
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpp/lib/QtWidgets/QPainter/qpainter_wrap.cpp
View File

@ -3,6 +3,7 @@
#include "Extras/Utils/nutils.h"
#include "QtCore/QPoint/qpoint_wrap.h"
#include "QtCore/QRect/qrect_wrap.h"
#include "QtGui/QBrush/qbrush_wrap.h"
#include "QtGui/QColor/qcolor_wrap.h"
#include "QtGui/QFont/qfont_wrap.h"
#include "QtGui/QImage/qimage_wrap.h"
@ -304,11 +305,21 @@ Napi::Value QPainterWrap::setBrush(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
Napi::HandleScope scope(env);
Napi::Object colorObject = info[0].As<Napi::Object>();
QColorWrap* colorWrap = Napi::ObjectWrap<QColorWrap>::Unwrap(colorObject);
QColor* color = colorWrap->getInternalInstance();
QBrush* brush = new QBrush(*color);
this->instance->setBrush(*brush);
Napi::String napiType = info[1].As<Napi::String>();
std::string type = napiType.Utf8Value();
if (type == "brush") {
Napi::Object brushObject = info[0].As<Napi::Object>();
QBrushWrap* brushWrap = Napi::ObjectWrap<QBrushWrap>::Unwrap(brushObject);
QBrush* brush = brushWrap->getInternalInstance();
this->instance->setBrush(*brush);
} else if (type == "color") {
Napi::Object colorObject = info[0].As<Napi::Object>();
QColorWrap* colorWrap = Napi::ObjectWrap<QColorWrap>::Unwrap(colorObject);
QColor* color = colorWrap->getInternalInstance();
QBrush* brush = new QBrush(*color);
this->instance->setBrush(*brush);
}
return env.Null();
}
Napi::Value QPainterWrap::setRenderHint(const Napi::CallbackInfo& info) {

9
src/lib/QtWidgets/QPainter.ts
View File

@ -2,6 +2,7 @@ import addon from '../utils/addon';
import { Component, NativeElement } from '../core/Component';
import { QPainterPath } from '../QtWidgets/QPainterPath';
import { PenStyle } from '../QtEnums';
import { QBrush } from '../QtGui/QBrush';
import { QColor } from '../QtGui/QColor';
import { QPoint } from '../QtCore/QPoint';
import { QPen } from '../QtGui/QPen';
@ -180,8 +181,12 @@ export class QPainter extends Component {
}
// TODO: void setBackground(const QBrush &brush)
// TODO: void setBackgroundMode(Qt::BGMode mode)
setBrush(color: QColor): void {
this.native.setBrush(color.native);
setBrush(colorOrBrush: QColor | QBrush): void {
if (colorOrBrush instanceof QColor) {
this.native.setBrush(colorOrBrush.native, 'color');
} else {
this.native.setBrush(colorOrBrush.native, 'brush');
}
}
setBrushOrigin(x: number, y: number): void {
this.native.setBrushOrigin(x, y);