omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added icons and popup menus

Browse Source
This commit is contained in:
omigamedev
2017-02-21 23:14:34 +00:00
parent a2714f513a
commit 75f1b96b4f
5 changed files with 126 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
data/layout.xml
View File

@@ -11,7 +11,7 @@
</button-custom> </button-custom>
</layout> </layout>
<layout id="multi-button"> <layout id="multi-button">
<node width="50" margin="0 5 0 0" dir="row" wrap="1"> <node width="50" margin="0 5 0 0" dir="row" wrap="1" flood-events="1">
<ref id="multi-button-item"/> <ref id="multi-button-item"/>
<ref id="multi-button-item"/> <ref id="multi-button-item"/>
<ref id="multi-button-item"/> <ref id="multi-button-item"/>
@@ -64,7 +64,7 @@
</button-custom> </button-custom>
</node> </node>
<!--settings tab--> <!--settings tab-->
<border color=".2" width="100%"></border> <border color=".2" width="100%" height="200"></border>
</node> </node>
<!--footer buttons--> <!--footer buttons-->
<node height="40" grow="1" dir="row" align="flex-end" justify="flex-end"> <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
@@ -77,25 +77,104 @@
</layout> </layout>
<!--popup menu--> <!--popup menu-->
<layout id="popup-menu"> <layout id="popup-menu">
<popup-menu positioning="absolute" position="100 100" width="100" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col"> <popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button text="Menu" height="25"/> <button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<button text="Menu" height="25"/> <icon icon="camera" width="20"/>
<button text="Menu" height="25"/> <text text="Snapshot" margin="0 0 0 5" font-face="arial" font-size="11"/>
<button text="Menu" height="25"/> </button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="layers" width="20"/>
<text text="Layers" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_white" width="20"/>
<text text="New Layer" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_white_paste" width="20"/>
<text text="Paste" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_white_stack" width="20"/>
<text text="Copy" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
</popup-menu>
</layout>
<!--popup menu-->
<layout id="file-menu">
<popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_add" width="20"/>
<text text="New Panodoc" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk" width="20"/>
<text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk_multiple" width="20"/>
<text text="Save as.." margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="add" width="20"/>
<text text="Add reference" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon width="20"/>
<text text="Quit" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
</popup-menu>
</layout>
<!--edit menu-->
<layout id="edit-menu">
<popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_add" width="20"/>
<text text="New Panodoc" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk" width="20"/>
<text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk_multiple" width="20"/>
<text text="Save as.." margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
</popup-menu>
</layout>
<!--layers menu-->
<layout id="layers-menu">
<popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="page_add" width="20"/>
<text text="New Panodoc" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk" width="20"/>
<text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="disk_multiple" width="20"/>
<text text="Save as.." margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
<button-custom text="Menu" height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="add" width="20"/>
<text text="Add reference" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
</popup-menu> </popup-menu>
</layout> </layout>
<!--main--> <!--main-->
<layout id="main"> <layout id="main">
<node dir="col" wrap="0" width="100%" height="100%" pad="5"> <node dir="col" wrap="0" width="100%" height="100%" pad="5">
<!-- menu bar --> <!-- menu bar -->
<border flood-events="1" margin="0 0 5 0" pad="3 0 3 3" color=".3" width="100%" height="25" dir="row" align="center"> <border flood-events="1" margin="0 0 5 0" pad="0 0 0 0" color=".1" width="100%" height="25" dir="row" align="center">
<button-custom id="menu-file" height="100%" margin="0 5 0 0" justify="center" align="center" pad="8"> <button-custom id="menu-file" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8">
<text text="File" font-face="arial" font-size="11"/> <text text="File" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
<button-custom id="menu-edit" height="100%" margin="0 5 0 0" justify="center" align="center" pad="8"> <button-custom id="menu-edit" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8">
<text text="Edit" font-face="arial" font-size="11"/> <text text="Edit" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
<button-custom id="menu-layers" height="100%" margin="0 5 0 0" justify="center" align="center" pad="8"> <button-custom id="menu-layers" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8">
<text text="Layers" font-face="arial" font-size="11"/> <text text="Layers" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
</border> </border>
@@ -218,5 +297,6 @@
</border> </border>
</node> </node>
<!--<ref id="settings"/>--> <!--<ref id="settings"/>-->
<!--<ref id="popup-menu"/>-->
</layout> </layout>
</root> </root>

24
engine/app.cpp
View File

@@ -156,7 +156,29 @@ void App::init()
{ {
menu_file->on_click = [=] { menu_file->on_click = [=] {
glm::vec2 pos = menu_file->m_pos + glm::vec2(0, menu_file->m_size.y); glm::vec2 pos = menu_file->m_pos + glm::vec2(0, menu_file->m_size.y);
popup = (NodePopupMenu*)layout[const_hash("popup-menu")].m_children[0]->clone(); popup = (NodePopupMenu*)layout[const_hash("file-menu")].m_children[0]->clone();
popup->SetPositioning(YGPositionTypeAbsolute);
popup->SetPosition(pos.x, pos.y);
layout[main_id].add_child(popup);
layout[main_id].update();
};
}
if (auto* menu_file = layout[main_id].find<NodeButtonCustom>("menu-edit"))
{
menu_file->on_click = [=] {
glm::vec2 pos = menu_file->m_pos + glm::vec2(0, menu_file->m_size.y);
popup = (NodePopupMenu*)layout[const_hash("edit-menu")].m_children[0]->clone();
popup->SetPositioning(YGPositionTypeAbsolute);
popup->SetPosition(pos.x, pos.y);
layout[main_id].add_child(popup);
layout[main_id].update();
};
}
if (auto* menu_file = layout[main_id].find<NodeButtonCustom>("menu-layers"))
{
menu_file->on_click = [=] {
glm::vec2 pos = menu_file->m_pos + glm::vec2(0, menu_file->m_size.y);
popup = (NodePopupMenu*)layout[const_hash("layers-menu")].m_children[0]->clone();
popup->SetPositioning(YGPositionTypeAbsolute); popup->SetPositioning(YGPositionTypeAbsolute);
popup->SetPosition(pos.x, pos.y); popup->SetPosition(pos.x, pos.y);
layout[main_id].add_child(popup); layout[main_id].add_child(popup);

3
engine/app.h
View File

@@ -14,6 +14,9 @@ class App
NodeMessageBox* msgbox; NodeMessageBox* msgbox;
NodeSettings* settings; NodeSettings* settings;
NodePopupMenu* popup = nullptr; NodePopupMenu* popup = nullptr;
NodePopupMenu* menu_file = nullptr;
NodePopupMenu* menu_edit = nullptr;
NodePopupMenu* menu_layers = nullptr;
const uint16_t main_id = const_hash("main"); const uint16_t main_id = const_hash("main");
public: public:
static App I; static App I;

6
engine/layout.cpp
View File

@@ -72,13 +72,13 @@ void Node::add_child(Node* n)
void Node::remove_child(Node* n) void Node::remove_child(Node* n)
{ {
auto i = std::find_if(m_children.begin(), m_children.end(), [=](std::unique_ptr<Node>& ptr) auto i = std::find_if(m_children.begin(), m_children.end(), [=](std::unique_ptr<Node>& ptr) { return ptr.get() == n; });
if (i != m_children.end())
{ {
return ptr.get() == n;
});
m_children.erase(i); m_children.erase(i);
YGNodeRemoveChild(y_node, n->y_node); YGNodeRemoveChild(y_node, n->y_node);
} }
}
void Node::update(float width, float height) void Node::update(float width, float height)
{ {

4
engine/layout.h
View File

@@ -652,7 +652,7 @@ public:
virtual Node* clone_instantiate() const override { return new NodeButtonCustom(); } virtual Node* clone_instantiate() const override { return new NodeButtonCustom(); }
virtual void clone_copy(Node* dest) const override virtual void clone_copy(Node* dest) const override
{ {
Node::clone_copy(dest); NodeBorder::clone_copy(dest);
NodeButtonCustom* n = static_cast<NodeButtonCustom*>(dest); NodeButtonCustom* n = static_cast<NodeButtonCustom*>(dest);
n->color_normal = color_normal; n->color_normal = color_normal;
n->color_hover = color_hover; n->color_hover = color_hover;
@@ -660,12 +660,14 @@ public:
} }
virtual void loaded() override virtual void loaded() override
{ {
NodeBorder::loaded();
//m_thinkness = 1; //m_thinkness = 1;
//m_border_color = glm::vec4(0, 0, 0, 1); //m_border_color = glm::vec4(0, 0, 0, 1);
m_color = color_normal; m_color = color_normal;
} }
virtual kEventResult handle_event(Event* e) override virtual kEventResult handle_event(Event* e) override
{ {
NodeBorder::handle_event(e);
switch (e->m_type) switch (e->m_type)
{ {
case kEventType::MouseEnter: case kEventType::MouseEnter: