Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorあく <alleteam@gmail.com>2021-01-29 16:52:16 +0300
committerGitHub <noreply@github.com>2021-01-29 16:52:16 +0300
commit523f99f154a19eea74533df24b75b67e8d5878a8 (patch)
treeebde85f4dd8a958832d04e1ae460573f36be5683 /applications/bt
parent7243758b402696f06648d1b34445ae1669e7370f (diff)
GUI: rename widget to ViewPort. Update GUI API usage. (#317)
Diffstat (limited to 'applications/bt')
-rw-r--r--applications/bt/bt.c12
-rw-r--r--applications/bt/bt_i.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/applications/bt/bt.c b/applications/bt/bt.c
index d3af0dfe..1621331e 100644
--- a/applications/bt/bt.c
+++ b/applications/bt/bt.c
@@ -9,11 +9,11 @@ Bt* bt_alloc() {
bt->menu = furi_record_open("menu");
bt->statusbar_icon = assets_icons_get(I_Bluetooth_5x8);
- bt->statusbar_widget = widget_alloc();
- widget_set_width(bt->statusbar_widget, icon_get_width(bt->statusbar_icon));
- widget_draw_callback_set(bt->statusbar_widget, bt_draw_statusbar_callback, bt);
- widget_enabled_set(bt->statusbar_widget, false);
- gui_add_widget(bt->gui, bt->statusbar_widget, GuiLayerStatusBarLeft);
+ bt->statusbar_view_port = view_port_alloc();
+ view_port_set_width(bt->statusbar_view_port, icon_get_width(bt->statusbar_icon));
+ view_port_draw_callback_set(bt->statusbar_view_port, bt_draw_statusbar_callback, bt);
+ view_port_enabled_set(bt->statusbar_view_port, false);
+ gui_add_view_port(bt->gui, bt->statusbar_view_port, GuiLayerStatusBarLeft);
bt->menu_icon = assets_icons_get(A_Bluetooth_14);
bt->menu_item = menu_item_alloc_menu("Bluetooth", bt->menu_icon);
@@ -45,7 +45,7 @@ void bt_task() {
api_hal_bt_init();
while(1) {
- widget_enabled_set(bt->statusbar_widget, api_hal_bt_is_alive());
+ view_port_enabled_set(bt->statusbar_view_port, api_hal_bt_is_alive());
osDelay(1000);
}
}
diff --git a/applications/bt/bt_i.h b/applications/bt/bt_i.h
index 01acfca8..e843a738 100644
--- a/applications/bt/bt_i.h
+++ b/applications/bt/bt_i.h
@@ -7,7 +7,7 @@
#include <cli/cli.h>
#include <gui/gui.h>
-#include <gui/widget.h>
+#include <gui/view_port.h>
#include <menu/menu.h>
#include <menu/menu_item.h>
@@ -18,7 +18,7 @@ typedef struct {
ValueMutex* menu;
// Status bar
Icon* statusbar_icon;
- Widget* statusbar_widget;
+ ViewPort* statusbar_view_port;
// Menu
Icon* menu_icon;
MenuItem* menu_item;