Skip to content

Commit 087e4d5

Browse files
committed
Merge branch 'dev'
2 parents 2f59ad6 + bffefe8 commit 087e4d5

File tree

3 files changed

+337
-136
lines changed

3 files changed

+337
-136
lines changed

example/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include $(DEVKITPRO)/libnx/switch_rules
3939
#---------------------------------------------------------------------------------
4040

4141
APP_TITLE := Tesla Example
42-
VERSION_VERSION := 1.3.0
42+
APP_VERSION := 1.3.0
4343

4444
TARGET := $(notdir $(CURDIR))
4545
BUILD := build

example/source/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class GuiSecondary : public tsl::Gui {
77
GuiSecondary() {}
88

99
virtual tsl::elm::Element* createUI() override {
10-
auto *rootFrame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.1 - Secondary Gui");
10+
auto *rootFrame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.2 - Secondary Gui");
1111

1212
rootFrame->setContent(new tsl::elm::DebugRectangle(tsl::gfx::Color{ 0x8, 0x3, 0x8, 0xF }));
1313

@@ -24,7 +24,7 @@ class GuiTest : public tsl::Gui {
2424
virtual tsl::elm::Element* createUI() override {
2525
// A OverlayFrame is the base element every overlay consists of. This will draw the default Title and Subtitle.
2626
// If you need more information in the header or want to change it's look, use a HeaderOverlayFrame.
27-
auto frame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.0");
27+
auto frame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.2");
2828

2929
// A list that can contain sub elements and handles scrolling
3030
auto list = new tsl::elm::List();
@@ -44,6 +44,7 @@ class GuiTest : public tsl::Gui {
4444

4545
list->addItem(clickableListItem);
4646
list->addItem(new tsl::elm::ListItem("Default List Item"));
47+
list->addItem(new tsl::elm::ListItem("Default List Item with an extra long name to trigger truncation and scrolling"));
4748
list->addItem(new tsl::elm::ToggleListItem("Toggle List Item", true));
4849

4950
// Custom Drawer, a element that gives direct access to the renderer

0 commit comments

Comments
 (0)