stable
This commit is contained in:
parent
6d02137dca
commit
a46a2167ba
13 changed files with 182 additions and 90 deletions
|
|
@ -7,9 +7,7 @@ using namespace tp;
|
|||
|
||||
class ExampleGUI : public Application {
|
||||
public:
|
||||
ExampleGUI() {
|
||||
gGlobalGUIConfig = &mConfig;
|
||||
}
|
||||
ExampleGUI() = default;
|
||||
|
||||
void processFrame(EventHandler* eventHandler) override {
|
||||
auto rec = RectF( { 0, 0 }, mWindow->getSize() );
|
||||
|
|
@ -21,7 +19,6 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
GlobalGUIConfig mConfig;
|
||||
ComplexWidget<EventHandler, Canvas> mGui;
|
||||
};
|
||||
|
||||
|
|
@ -35,8 +32,13 @@ int main() {
|
|||
}
|
||||
|
||||
{
|
||||
ExampleGUI gui;
|
||||
gui.run();
|
||||
GlobalGUIConfig mConfig;
|
||||
gGlobalGUIConfig = &mConfig;
|
||||
|
||||
{
|
||||
ExampleGUI gui;
|
||||
gui.run();
|
||||
}
|
||||
}
|
||||
|
||||
binModule.deinitialize();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace tp {
|
|||
this->mArea.w = 30;
|
||||
this->mVisible = areaParent.isOverlap(aArea);
|
||||
if (!this->mVisible) return;
|
||||
mIsHover = aArea.isInside(events.getPos());
|
||||
mIsHover = aArea.isInside(events.getPointer());
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) override {
|
||||
|
|
@ -62,7 +62,7 @@ namespace tp {
|
|||
this->mArea.w = 50;
|
||||
this->mVisible = areaParent.isOverlap(aArea);
|
||||
if (!this->mVisible) return;
|
||||
mIsHover = aArea.isInside(events.getPos());
|
||||
mIsHover = aArea.isInside(events.getPointer());
|
||||
}
|
||||
|
||||
void draw(Canvas& canvas) override {
|
||||
|
|
@ -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;
|
||||
|
|
@ -190,34 +190,34 @@ namespace tp {
|
|||
template <typename Events, typename Canvas>
|
||||
class ChattingWidget : public Widget<Events, Canvas> {
|
||||
public:
|
||||
explicit ChattingWidget() {
|
||||
ChattingWidget() {
|
||||
this->createConfig("Chatting");
|
||||
this->addColor("Back", "Background");
|
||||
this->addValue("Padding", "Padding");
|
||||
|
||||
// todo : fetch code
|
||||
mUsers.append(UserWidget<Events, Canvas>());
|
||||
mUsers.append(UserWidget<Events, Canvas>());
|
||||
mUsers.append(UserWidget<Events, Canvas>());
|
||||
mUsers.append(new UserWidget<Events, Canvas>());
|
||||
mUsers.append(new UserWidget<Events, Canvas>());
|
||||
mUsers.append(new 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(MessageWidget<Events, Canvas>());
|
||||
mActive.mMessages.append(MessageWidget<Events, Canvas>());
|
||||
mActive.mMessages.append(MessageWidget<Events, Canvas>());
|
||||
mActive.mMessages.append(new MessageWidget<Events, Canvas>());
|
||||
mActive.mMessages.append(new MessageWidget<Events, Canvas>());
|
||||
mActive.mMessages.append(new 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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue