Skip to content

Commit

Permalink
cleanups: nicer demo
Browse files Browse the repository at this point in the history
Stacked demo is now more visible (each sub widget has different color).

Fixed some compilation issues.
  • Loading branch information
diegoiast committed Jan 10, 2024
1 parent b8f38c4 commit 6962723
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
3 changes: 1 addition & 2 deletions src/layout.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
#include <functional>
#include <list>
#include <memory>
#include <sizepoint.h>
#include <vector>

#include "sizepoint.h"

struct Widget;

struct LayoutParams {
Expand Down
21 changes: 12 additions & 9 deletions src/main.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -132,18 +132,21 @@ int main() {

auto stack = w2->add_new<Stackwidget>();
stack->add_new<Label>(Position{}, Size{}, "Widget 1");
stack->add_new<Label>(Position{}, Size{}, "Widget 2");
stack->add_new<Label>(Position{}, Size{}, "Widget 3");
stack->add_new<Label>(Position{}, Size{}, "Widget 4");
stack->add_new<Label>(Position{}, Size{}, "Widget 2")->content.background_color =
MakeColor(0xaa, 0x22, 0x22);
stack->add_new<Label>(Position{}, Size{}, "Widget 3")->content.background_color =
MakeColor(0x33, 0xaa, 0x22);
stack->add_new<Label>(Position{}, Size{}, "Widget 4")->content.background_color =
MakeColor(0x33, 0x22, 0xaa);

list->on_item_selected = [&stack](auto list, auto index /*, auto reason*/) {
stack->set_current_page(index);
};
};

platform.show_window(w2);
#endif

#if 0
#if 1
auto w1 = platform.open_window(100, 100, 640, 480, "test 1");
auto l =
w1->add_new<Label>(Position{10, 10}, Size{300, 20}, "test 1 - Hello world! glqi שלום עולם");
Expand All @@ -156,7 +159,7 @@ int main() {
auto l_right = center_layout->add(std::make_shared<VerticalLayout>());

w1->main_widget.layout->margin.set(5);
center_layout->padding.set_horitzonal(10);
center_layout->padding.set_horizontal(10);

// l_right->margin.set(5);
w1->add_new_to_layout<ListView>(l_left, Position{10, 80}, Size{165, 100})->adapter =
Expand Down Expand Up @@ -220,9 +223,9 @@ int main() {
spin->did_change = [&scroll](auto spinbox, auto value) { scroll->set_value(value); };

auto buttons_layout = w1->main_widget.layout->add(std::make_shared<HorizontalLayout>());
buttons_layout->margin.set_horitzonal(5);
buttons_layout->margin.set_horizontal(5);
buttons_layout->margin.set_vertical(5);
buttons_layout->padding.set_horitzonal(10);
buttons_layout->padding.set_horizontal(10);
buttons_layout->add(std::make_shared<HorizontalSpacer>())->weight = 2;

w1->add_new_to_layout<Button>(buttons_layout, Position{10, 420}, Size{200, 40}, "OK", true,
Expand All @@ -235,7 +238,7 @@ int main() {
buttons_layout, Position{220, 420}, Size{200, 40}, "Cancel", false, [&cancel_button]() {
static auto clicked_count = 0;
clicked_count++;
spdlog::info("Cancel clicke1d! count = {}", clicked_count);
spdlog::info("Cancel Clicked! count = {}", clicked_count);
cancel_button->text = fmt::format("Cancel ({})", clicked_count);
cancel_button->invalidate();
});
Expand Down

0 comments on commit 6962723

Please sign in to comment.