From 948c5ebd85b4012376f05e256d7d56101d9344a2 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 25 Jul 2020 13:22:42 +0300
Subject: [PATCH] Some GUI style fixes
---
applications/gui2/src/modules/addsource.cpp | 1 +
applications/gui2/src/modules/calibration/calibration.cpp | 1 +
applications/gui2/src/modules/config.cpp | 1 +
applications/gui2/src/modules/statistics.cpp | 1 +
applications/gui2/src/modules/thumbnails.cpp | 1 +
applications/gui2/src/views/config.cpp | 1 +
6 files changed, 6 insertions(+)
diff --git a/applications/gui2/src/modules/addsource.cpp b/applications/gui2/src/modules/addsource.cpp
index 8b0aa3267..d90039c3e 100644
--- a/applications/gui2/src/modules/addsource.cpp
+++ b/applications/gui2/src/modules/addsource.cpp
@@ -4,6 +4,7 @@ using ftl::gui2::AddCtrl;
void AddCtrl::init() {
button = screen->addButton(ENTYPO_ICON_PLUS);
+ button->setTooltip("Add New Source");
button->setCallback([this](){
button->setPushed(false);
show();
diff --git a/applications/gui2/src/modules/calibration/calibration.cpp b/applications/gui2/src/modules/calibration/calibration.cpp
index 910c30467..2c87f99f4 100644
--- a/applications/gui2/src/modules/calibration/calibration.cpp
+++ b/applications/gui2/src/modules/calibration/calibration.cpp
@@ -238,6 +238,7 @@ void Calibration::init() {
auto button = screen->addButton<ftl::gui2::PopupButton>("", ENTYPO_ICON_CAMERA);
button->setChevronIcon(0);
+ button->setTooltip("Calibrate Cameras");
auto* popup = button->popup();
popup->setLayout(new nanogui::BoxLayout
diff --git a/applications/gui2/src/modules/config.cpp b/applications/gui2/src/modules/config.cpp
index ab38d5f38..bfac6664e 100644
--- a/applications/gui2/src/modules/config.cpp
+++ b/applications/gui2/src/modules/config.cpp
@@ -4,6 +4,7 @@ using ftl::gui2::ConfigCtrl;
void ConfigCtrl::init() {
button = screen->addButton(ENTYPO_ICON_COG);
+ button->setTooltip("Settings");
button->setCallback([this](){
button->setPushed(false);
show();
diff --git a/applications/gui2/src/modules/statistics.cpp b/applications/gui2/src/modules/statistics.cpp
index 9b9016756..60fe0fedd 100644
--- a/applications/gui2/src/modules/statistics.cpp
+++ b/applications/gui2/src/modules/statistics.cpp
@@ -41,6 +41,7 @@ void Statistics::init() {
widget = new ftl::gui2::StatisticsWidget(screen, this);
widget->setVisible(value("visible", false));
auto button = screen->addButton(ENTYPO_ICON_INFO);
+ button->setTooltip("Show Information");
button->setCallback([this, button](){
button->setPushed(false);
widget->setVisible(!widget->visible());
diff --git a/applications/gui2/src/modules/thumbnails.cpp b/applications/gui2/src/modules/thumbnails.cpp
index 14f582233..f23dd97ee 100644
--- a/applications/gui2/src/modules/thumbnails.cpp
+++ b/applications/gui2/src/modules/thumbnails.cpp
@@ -12,6 +12,7 @@ using ftl::gui2::ThumbnailsController;
void ThumbnailsController::init() {
auto button = screen->addButton(ENTYPO_ICON_HOME);
+ button->setTooltip("Home");
button->setCallback([this, button](){
button->setPushed(false);
activate();
diff --git a/applications/gui2/src/views/config.cpp b/applications/gui2/src/views/config.cpp
index 896f773cc..029b66d65 100644
--- a/applications/gui2/src/views/config.cpp
+++ b/applications/gui2/src/views/config.cpp
@@ -41,6 +41,7 @@ private:
}
}
previous = str;
+ screen()->performLayout();
}
}
--
GitLab