From 8aec37d1de9a4544c43ed87dc946a77e23989401 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Thu, 8 Dec 2022 17:54:08 +0300 Subject: [PATCH] Electron crystal simulation UI tweaks --- examples/electron_crystal.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/electron_crystal.cpp b/examples/electron_crystal.cpp index de18c294..2bf36838 100644 --- a/examples/electron_crystal.cpp +++ b/examples/electron_crystal.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -64,16 +65,16 @@ main_scene::main_scene(ui::controller & ui_controller) wheel_event->set_child(element_factory.make_screen()); root->add_child(wheel_event, ui::screen::x_policy::fill, ui::screen::y_policy::fill); - auto panel = element_factory.make_frame(); - panel->set_min_size(geom::vector{200.f, 100.f}); - root->add_child(panel, ui::screen::x_policy::left, ui::screen::y_policy::top); + auto panel = element_factory.make_window(""); + panel->caption()->set_tagged_text("[bold][uline]Options[/uline][/bold]"); + root->add_child(panel, ui::screen::x_policy::floating, ui::screen::y_policy::floating); auto layout = element_factory.make_grid_layout(); panel->set_child(layout); auto count_name_label = element_factory.make_label("Count:"); count_name_label->set_valign(ui::label::valignment::center); - count_name_label->set_halign(ui::label::halignment::left); + count_name_label->set_halign(ui::label::halignment::right); auto count_value_label = element_factory.make_label(""); count_value_label->set_valign(ui::label::valignment::center); count_value_label->set_halign(ui::label::halignment::center); @@ -98,7 +99,7 @@ main_scene::main_scene(ui::controller & ui_controller) auto step_name_label = element_factory.make_label("Step:"); step_name_label->set_valign(ui::label::valignment::center); - step_name_label->set_halign(ui::label::halignment::left); + step_name_label->set_halign(ui::label::halignment::right); auto step_value_label = element_factory.make_label(""); step_value_label->set_valign(ui::label::valignment::center); step_value_label->set_halign(ui::label::halignment::center); @@ -113,7 +114,7 @@ main_scene::main_scene(ui::controller & ui_controller) auto precision_name_label = element_factory.make_label("Precision:"); precision_name_label->set_valign(ui::label::valignment::center); - precision_name_label->set_halign(ui::label::halignment::left); + precision_name_label->set_halign(ui::label::halignment::right); auto precision_value_label = element_factory.make_label(""); precision_value_label->set_valign(ui::label::valignment::center); precision_value_label->set_halign(ui::label::halignment::center); @@ -141,9 +142,10 @@ main_scene::main_scene(ui::controller & ui_controller) ui::style style; style.font = ui::make_default_9x12_font(); - style.text_scale = 2; + style.bold_font = ui::make_default_10x12_bold_font(); + style.text_scale = 1; style.bg_color = gfx::color_rgba{127, 127, 191, 255}; - style.fg_color = gfx::color_rgba{255, 255, 255, 255}; + style.fg_color = gfx::color_rgba{127, 127, 255, 255}; style.action_color = gfx::color_rgba{0, 0, 255, 255}; style.highlight_color = gfx::color_rgba{0, 255, 255, 255}; style.border_width = 0;