Skip to content
Snippets Groups Projects
Commit 948c5ebd authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Some GUI style fixes

parent 8d4598c0
No related branches found
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
...@@ -4,6 +4,7 @@ using ftl::gui2::AddCtrl; ...@@ -4,6 +4,7 @@ using ftl::gui2::AddCtrl;
void AddCtrl::init() { void AddCtrl::init() {
button = screen->addButton(ENTYPO_ICON_PLUS); button = screen->addButton(ENTYPO_ICON_PLUS);
button->setTooltip("Add New Source");
button->setCallback([this](){ button->setCallback([this](){
button->setPushed(false); button->setPushed(false);
show(); show();
......
...@@ -238,6 +238,7 @@ void Calibration::init() { ...@@ -238,6 +238,7 @@ void Calibration::init() {
auto button = screen->addButton<ftl::gui2::PopupButton>("", ENTYPO_ICON_CAMERA); auto button = screen->addButton<ftl::gui2::PopupButton>("", ENTYPO_ICON_CAMERA);
button->setChevronIcon(0); button->setChevronIcon(0);
button->setTooltip("Calibrate Cameras");
auto* popup = button->popup(); auto* popup = button->popup();
popup->setLayout(new nanogui::BoxLayout popup->setLayout(new nanogui::BoxLayout
......
...@@ -4,6 +4,7 @@ using ftl::gui2::ConfigCtrl; ...@@ -4,6 +4,7 @@ using ftl::gui2::ConfigCtrl;
void ConfigCtrl::init() { void ConfigCtrl::init() {
button = screen->addButton(ENTYPO_ICON_COG); button = screen->addButton(ENTYPO_ICON_COG);
button->setTooltip("Settings");
button->setCallback([this](){ button->setCallback([this](){
button->setPushed(false); button->setPushed(false);
show(); show();
......
...@@ -41,6 +41,7 @@ void Statistics::init() { ...@@ -41,6 +41,7 @@ void Statistics::init() {
widget = new ftl::gui2::StatisticsWidget(screen, this); widget = new ftl::gui2::StatisticsWidget(screen, this);
widget->setVisible(value("visible", false)); widget->setVisible(value("visible", false));
auto button = screen->addButton(ENTYPO_ICON_INFO); auto button = screen->addButton(ENTYPO_ICON_INFO);
button->setTooltip("Show Information");
button->setCallback([this, button](){ button->setCallback([this, button](){
button->setPushed(false); button->setPushed(false);
widget->setVisible(!widget->visible()); widget->setVisible(!widget->visible());
......
...@@ -12,6 +12,7 @@ using ftl::gui2::ThumbnailsController; ...@@ -12,6 +12,7 @@ using ftl::gui2::ThumbnailsController;
void ThumbnailsController::init() { void ThumbnailsController::init() {
auto button = screen->addButton(ENTYPO_ICON_HOME); auto button = screen->addButton(ENTYPO_ICON_HOME);
button->setTooltip("Home");
button->setCallback([this, button](){ button->setCallback([this, button](){
button->setPushed(false); button->setPushed(false);
activate(); activate();
......
...@@ -41,6 +41,7 @@ private: ...@@ -41,6 +41,7 @@ private:
} }
} }
previous = str; previous = str;
screen()->performLayout();
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment