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

recover lost commit

Browse Source
This commit is contained in:
omigamedev
2019-08-28 15:32:46 +02:00
parent 4651d81955 62a95c1a0f
commit ee2483be1b
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/layout.xml
View File

@@ -693,7 +693,7 @@
<slider-h id="grid-ground-offset" value="0.25"/>
</node>
<node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
<combobox id="grid-ground-resolution" width="100%" height="30" combo-list="0.1,0.5,1,2,4,8" default="2"/>
<combobox id="grid-ground-resolution" width="100%" height="28" combo-list="0.1,0.5,1,2,4,8" default="2"/>
</node>
</node>
</node>
@@ -731,7 +731,7 @@
</node>
<node dir="col" align="center" grow="1" width="1" flood-events="1" color=".3" >
<node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
<combobox id="grid-heightmap-shading" width="100%" height="30" combo-list="Transparent,Flat,Solid,Textured" default="0"/>
<combobox id="grid-heightmap-shading" width="100%" height="28" combo-list="Transparent,Flat,Solid,Textured" default="0"/>
</node>
<node height="20" pad="1" width="100%" margin="5 0 0 0">
<slider-h id="grid-heightmap-wireframe" value="1.0"/>
@@ -753,10 +753,10 @@
<slider-h id="grid-heightmap-radius" value="0.25"/>
</node>
<node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
<combobox id="grid-heightmap-samples" width="100%" height="30" combo-list="1,4,8,16,32,64,128" default="2"/>
<combobox id="grid-heightmap-samples" width="100%" height="28" combo-list="1,4,8,16,32,64,128" default="2"/>
</node>
<node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
<combobox id="grid-heightmap-texres" width="100%" height="30" combo-list="256,512,1024,2048,4096" default="1"/>
<combobox id="grid-heightmap-texres" width="100%" height="28" combo-list="256,512,1024,2048,4096" default="1"/>
</node>
</node>
</node>
@@ -771,7 +771,7 @@
<!-- MESSAGE BOX -->
<layout id="message-box">
<border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
<border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center">
<border thickness="1" border-color=".2" pad="3">
<border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
<text id="title" text="Just a test message"></text>
@@ -789,8 +789,8 @@
<!-- PROGRESS BAR -->
<layout id="progress-bar">
<border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
<border thickness="1" border-color=".2" pad="3">
<border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center">
<border id="body" thickness="1" border-color=".2" pad="3">
<border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
<text id="title" text="Just a test message"></text>
</border>

3
src/app_layout.cpp
View File

@@ -354,8 +354,11 @@ void App::init_sidebar()
if (grid->m_parent)
{
if (auto fp = dynamic_cast<NodePanelFloating*>(grid->m_parent->m_parent))
{
grid->remove_from_parent();
fp->destroy();
}
}
layout[main_id]->add_child(grid);
auto tick = layout[main_id]->add_child<NodeImage>();
tick->SetPositioning(YGPositionTypeAbsolute);

1
src/node_dialog_cloud.cpp
View File

@@ -45,6 +45,7 @@ void NodeDialogCloud::loaded()
void NodeDialogCloud::removed(Node* parent)
{
NodeBorder::removed(parent);
closed = true;
}

7
src/node_progress_bar.cpp
View File

@@ -19,6 +19,7 @@ void NodeProgressBar::init()
btn_cancel = find<NodeButton>("btn-cancel");
btn_cancel->on_click = [&](Node*) { destroy(); };
m_progress = find<NodeBorder>("progress");
m_body = find<NodeBorder>("body");
m_progress->SetWidthP(0);
}
@@ -34,3 +35,9 @@ void NodeProgressBar::set_progress(float p) noexcept
{
m_progress->SetWidthP(p * 100.f);
}
void NodeProgressBar::added(Node* parent)
{
NodeBorder::added(parent);
m_body->mouse_capture();
}

2
src/node_progress_bar.h
View File

@@ -11,6 +11,7 @@ public:
NodeButton* btn_cancel;
NodeText* m_title;
NodeBorder* m_progress;
NodeBorder* m_body;
int m_total = 0;
int m_count = 0;
virtual Node* clone_instantiate() const override;
@@ -18,4 +19,5 @@ public:
void increment() noexcept;
// set progress where p [0, 1]
void set_progress(float p) noexcept;
virtual void added(Node* parent) override;
};