Skip to content

Commit 9cc809e

Browse files
committed
UIデザインの改良
1 parent 8d50dca commit 9cc809e

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

pltGUI/Main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
void Main()
66
{
7-
Window::SetTitle(U"pltGUI");
7+
Window::SetTitle(U"pltGUI v1.2.0");
88
addLicense();
99
LicenseManager::DisableDefaultTrigger();
1010

pltGUI/my_gui.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ namespace MyGUI {
519519
{
520520
region
521521
.draw()
522-
.drawFrame(0.0, 1.5, ColorF{ 0.35, 0.7, 1.0, 0.75 })
522+
//.drawFrame(0.0, 1.5, ColorF{ 0.35, 0.7, 1.0, 0.75 })
523523
.drawFrame(2.5, 0.0, ColorF{ 0.35, 0.7, 1.0 });
524524

525525
// 範囲選択領域の背景色描画

pltGUI/plt_setting.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Pulldown
7171
return;
7272
}
7373

74-
m_rect.drawFrame(1, 0, m_isOpen ? UIColor::Accent : UIColor::frame());
74+
m_rect.drawFrame(m_isOpen ? 2.5:2, 0, m_isOpen ? UIColor::Accent : Color{ 128 });
7575

7676
Point pos = m_rect.pos;
7777

@@ -86,7 +86,7 @@ class Pulldown
8686
{
8787
const Rect backRect{ pos, m_rect.w, (m_rect.h * m_items.size()) };
8888

89-
backRect.drawShadow({ 1, 1 }, 4, 1).draw();
89+
backRect/*.drawShadow({1, 1}, 4, 1)*/.draw();
9090

9191
for (const auto& item : m_items)
9292
{
@@ -101,7 +101,7 @@ class Pulldown
101101
pos.y += m_rect.h;
102102
}
103103

104-
backRect.drawFrame(1, 0, Palette::Gray);
104+
backRect.drawFrame(2, 0, ColorF{ 0.5 });
105105
}
106106
}
107107

pltGUI/ui_plt_setting.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,17 @@ class WholeSettingUI : public ScrollableUI {
7676
MyGUI::Text(U"sample", dpos.x(180));
7777
MyGUI::TextArea(s.sample, dpos.y(55+ s.sample.v.lineNum*30),s.sample.v.size(400));
7878

79-
MyGUI::CheckBoxArea(s.key.b, dpos.x(20), s.key.v.pos.isOpen() ? Vec2(600, 250) : Vec2(600, 50));
79+
MyGUI::CheckBoxArea(s.key.b, dpos.x(20), Size(600, (s.key.b ? 60 : 0) + (s.key.v.pos.isOpen() ? 250 : 50)));
8080
MyGUI::Text(U"key", dpos.x(180));
81-
s.key.v.pos.setPos((dpos.x(250) - Vec2(0, 15)).asPoint());
82-
s.key.v.pos.update();
83-
s.key.v.pos.draw();
84-
MyGUI::CheckBox(s.key.v.box, dpos.x(20));
85-
MyGUI::Text(U"box", dpos.y(55));
81+
s.key.v.pos.setPos((dpos.y(55) - Vec2(0, 15)).asPoint())->update()->draw();
8682
if (s.key.v.pos.isOpen()) {
8783
dpos.y(200);
8884
}
85+
if (s.key.b) {
86+
dpos.x(220);
87+
MyGUI::CheckBoxArea(s.key.v.box, dpos.x(20), Size(50, 50));
88+
MyGUI::Text(U"box", dpos.y(55));
89+
}
8990

9091
dpos.x(20);
9192
MyGUI::Text(U"tics", dpos.x(200));

0 commit comments

Comments
 (0)