ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update widgets

Browse source
This commit is contained in:
IlyaShurupov 2024-05-07 12:04:36 +03:00 • committed by Ilya Shurupov
parent 35cb553ecb
commit 0f8fb5c580
18 changed files with 171 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Sketch3D/applications/Entry.cpp
View file

@ -17,7 +17,7 @@ public:
mGui.setVisible(true);
mGui.setArea(rec);
mGui.updateConfigWrapper(mWidgetManager);
mGui.procWrapper(*eventHandler);
mGui.procWrapper(*eventHandler, rec);
}
void drawFrame(Canvas* canvas) override { mGui.drawWrapper(*canvas); }

18
Sketch3D/public/Sketch3DWidget.hpp
View file

@ -18,7 +18,7 @@ namespace tp {
~Sketch3DWidget() { mCanvas->deleteImageHandle(mImage); }
void procCallback(const Events& events) override {
void eventProcess(const Events& events) override {
if (!this->mArea.isInside(events.getPointer())) {
return;
}
@ -71,7 +71,7 @@ namespace tp {
mActionPosAbsolutePrev = absolutePos;
}
void drawCallback(Canvas& canvas) override {
void eventDraw(Canvas& canvas) override {
mRenderer.renderToTexture(&mProject, this->mArea.size);
canvas.drawImage(this->mArea, &mImage, 0, 1, 12);
}
@ -126,27 +126,27 @@ namespace tp {
}
}
void procCallback(const Events& events) override {
void eventProcess(const Events& events) override {
mSplitView.setArea(this->mArea);
mViewport.setArea(mSplitView.getFirst());
mOptions.setArea(mSplitView.getSecond());
if (mDrawButton->mIsPressed) {
if (mDrawButton->isFired()) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::DRAW;
} else if (mMoveButton->mIsPressed) {
} else if (mMoveButton->isFired()) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::MOVE;
} else if (mRotateButton->mIsPressed) {
} else if (mRotateButton->isFired()) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::ROTATE;
} else if (mZoomButton->mIsPressed) {
} else if (mZoomButton->isFired()) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::ZOOM;
}
mViewport.setColor(RGBA(mRed->mSlider.mFactor, mGreen->mSlider.mFactor, mBlue->mSlider.mFactor, 1.f));
}
void drawCallback(Canvas& canvas) override { canvas.rect(this->mArea, mBackgroundColor, mRounding); }
void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, mBackgroundColor, mRounding); }
void updateConfigCallback(WidgetManager& wm) override {
void eventUpdateConfiguration(WidgetManager& wm) override {
wm.setActiveId("Sketch3DGui");
mBackgroundColor = wm.getColor("Background", "Background");