Unstable & with drawing restored
This commit is contained in:
parent
11402f577a
commit
0f4a67e244
15 changed files with 1004 additions and 31 deletions
|
|
@ -25,7 +25,7 @@ namespace tp {
|
|||
mIsHover = aArea.isInside(events.getPos());
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
if (!this->mVisible) return;
|
||||
|
||||
if (mIsHover) canvas.rect(this->mArea, this->getColor("Accent"), this->getValue("Rounding"));
|
||||
|
|
@ -65,7 +65,7 @@ namespace tp {
|
|||
mIsHover = aArea.isInside(events.getPos());
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
if (!this->mVisible) return;
|
||||
|
||||
if (mIsHover) canvas.rect(this->mArea, this->getColor("Base"), this->getValue("Rounding"));
|
||||
|
|
@ -119,7 +119,7 @@ namespace tp {
|
|||
}
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
canvas.rect(this->mArea, this->getColor("Back"));
|
||||
mButton.draw(canvas);
|
||||
mUser.draw(canvas);
|
||||
|
|
@ -173,7 +173,7 @@ namespace tp {
|
|||
mHistoryView.proc(events, this->mArea, history);
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
canvas.rect(this->mArea, this->getColor("Back"));
|
||||
mHistoryView.draw(canvas);
|
||||
mMessage.draw(canvas);
|
||||
|
|
@ -232,7 +232,7 @@ namespace tp {
|
|||
mActive.proc(events, aArea, mSplitView.getFirst());
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
canvas.rect(this->mArea, this->getColor("Back"));
|
||||
mSplitView.draw(canvas);
|
||||
mSideView.draw(canvas);
|
||||
|
|
@ -267,7 +267,7 @@ namespace tp {
|
|||
}
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
canvas.rect(this->mArea, this->getColor("Back"));
|
||||
if (mLogged) mChatting.draw(canvas);
|
||||
else mLogin.draw(canvas);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ namespace tp {
|
|||
mLabel.proc(events, aArea, aArea);
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
if (mIsPressed) {
|
||||
canvas.rect(this->mArea, this->getColor("Pressed"), this->getValue("Rounding"));
|
||||
} else if (mIsHover) {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace tp {
|
|||
this->mArea = aArea;
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
canvas.text(
|
||||
mLabel.read(),
|
||||
this->mArea,
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ namespace tp {
|
|||
mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction);
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
auto area = getHandle();
|
||||
|
||||
if (mSizeFraction > 1.f) return;
|
||||
|
|
@ -162,7 +162,7 @@ namespace tp {
|
|||
}
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
if (!this->mVisible) return;
|
||||
mScroller.draw(canvas);
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ namespace tp {
|
|||
}
|
||||
|
||||
// takes whole area
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
if (mResizeInProcess) canvas.rect(getHandle(), this->getColor("Resizing"));
|
||||
else if (mIsHover) canvas.rect(getHandle(), this->getColor("Hovered"));
|
||||
else canvas.rect(getHandle(), this->getColor("Handle"));
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ namespace tp {
|
|||
ImGui::PopStyleVar(3);
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) const override {
|
||||
void draw(Canvas& canvas) override {
|
||||
// canvas.rect(this->mArea, this->getColor("Base"));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue