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

Graphics refactor finished

Browse source
This commit is contained in:
IlyaShurupov 2024-03-20 11:31:50 +03:00 • committed by Ilya Shurupov
parent bfbdd0e33b
commit 8451c56e93
12 changed files with 114 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Widgets/examples/ExampleGUI.hpp
View file

@ -181,7 +181,7 @@ namespace tp {
}
public:
Buffer<MessageWidget<Events, Canvas>*> mMessages;
Buffer<MessageWidget<Events, Canvas>> mMessages;
ScrollableWindow<Events, Canvas> mHistoryView;
TextInputWidget<Events, Canvas> mMessage;
ButtonWidget<Events, Canvas> mSend;
@ -196,28 +196,28 @@ namespace tp {
this->addValue("Padding", "Padding");
// todo : fetch code
mUsers.append(new UserWidget<Events, Canvas>());
mUsers.append(new UserWidget<Events, Canvas>());
mUsers.append(new UserWidget<Events, Canvas>());
mUsers.append(UserWidget<Events, Canvas>());
mUsers.append(UserWidget<Events, Canvas>());
mUsers.append(UserWidget<Events, Canvas>());
mUsers[0]->mArea = { 0, 0, 100, 100 };
mUsers[1]->mArea = { 0, 0, 100, 100 };
mUsers[2]->mArea = { 0, 0, 100, 100 };
mUsers[0].mArea = { 0, 0, 100, 100 };
mUsers[1].mArea = { 0, 0, 100, 100 };
mUsers[2].mArea = { 0, 0, 100, 100 };
for (auto message : mUsers) {
mSideView.mContents.append(message.data());
mSideView.mContents.append(&message.data());
}
mActive.mMessages.append(new MessageWidget<Events, Canvas>());
mActive.mMessages.append(new MessageWidget<Events, Canvas>());
mActive.mMessages.append(new MessageWidget<Events, Canvas>());
mActive.mMessages.append(MessageWidget<Events, Canvas>());
mActive.mMessages.append(MessageWidget<Events, Canvas>());
mActive.mMessages.append(MessageWidget<Events, Canvas>());
mActive.mMessages[0]->mArea = { 0, 0, 100, 100 };
mActive.mMessages[1]->mArea = { 0, 0, 100, 100 };
mActive.mMessages[2]->mArea = { 0, 0, 100, 100 };
mActive.mMessages[0].mArea = { 0, 0, 100, 100 };
mActive.mMessages[1].mArea = { 0, 0, 100, 100 };
mActive.mMessages[2].mArea = { 0, 0, 100, 100 };
for (auto message : mActive.mMessages) {
mActive.mHistoryView.mContents.append(message.data());
mActive.mHistoryView.mContents.append(&message.data());
}
}
@ -240,7 +240,7 @@ namespace tp {
}
public:
Buffer<UserWidget<Events, Canvas>*> mUsers;
Buffer<UserWidget<Events, Canvas>> mUsers;
ScrollableWindow<Events, Canvas> mSideView;
ActiveChatWidget<Events, Canvas> mActive;
SplitView<Events, Canvas> mSplitView;

6
Widgets/public/ScrollableWidget.hpp
View file

@ -136,11 +136,7 @@ namespace tp {
this->addValue("Padding", "Padding");
}
~ScrollableWindow() {
for (auto content : mContents) {
delete content.data();
}
}
~ScrollableWindow() = default;
// takes whole area
void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override {