RandyTheSilly/1-More-Episode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Various alignment fixes + neat_bar bump

Browse Source
This commit is contained in:
Randall Winkhart
2026-07-21 22:16:18 -04:00
parent bcb7abfe7b
commit 7d556b025b
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neat_bar
+1 -1
Submodule neat_bar updated: 147a230c97...2a909727c0
resources/next~bw.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 84 B

resources/next~color.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 B

After

Width:  |  Height:  |  Size: 96 B

src/c/main.c
+20 -22
View File
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <string.h>
// #define DEBUG_MODE 1
#define DEBUG_MODE 1
// declare settings-derived statics
static uint8_t s_is_jellyfin;
@@ -93,6 +93,7 @@ static void update_sleep_time(time_t start, time_t end) {
}
static void sleep_bar_update_proc(Layer *layer, GContext *ctx) {
graphics_context_set_antialiased(ctx, false);
graphics_context_set_fill_color(ctx, s_color_primary);
graphics_fill_rect(ctx, layer_get_bounds(layer), PBL_IF_ROUND_ELSE(15, 3), PBL_IF_ROUND_ELSE(GCornersBottom, GCornersAll));
}
@@ -159,30 +160,25 @@ static void main_window_load(Window *window) {
// neat bar
s_neat_bar_layer = neat_bar_layer_create();
neat_bar_layer_set_background_color(s_neat_bar_layer, s_color_secondary);
neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_UP, s_prev_icon);
neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_SELECT, s_pin_icon);
neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_DOWN, s_next_icon);
neat_bar_layer_set_background_color(s_neat_bar_layer, s_color_secondary);
neat_bar_layer_set_width(s_neat_bar_layer, NEAT_BAR_WIDTH);
#if PBL_DISPLAY_HEIGHT >= 260 && PBL_ROUND
neat_bar_layer_set_corner_radius(s_neat_bar_layer, 15);
neat_bar_layer_set_height(s_neat_bar_layer, 140);
neat_bar_layer_set_y_offset(s_neat_bar_layer, 60);
#elif PBL_DISPLAY_HEIGHT == 228 && PBL_RECT
neat_bar_layer_set_corner_radius(s_neat_bar_layer, 3);
neat_bar_layer_set_floating(s_neat_bar_layer, 4);
neat_bar_layer_set_height(s_neat_bar_layer, 183);
neat_bar_layer_set_y_offset(s_neat_bar_layer, 41);
#elif PBL_DISPLAY_HEIGHT == 180 && PBL_ROUND
neat_bar_layer_set_corner_radius(s_neat_bar_layer, 15);
neat_bar_layer_set_height(s_neat_bar_layer, 71);
neat_bar_layer_set_y_offset(s_neat_bar_layer, 54);
#else // 144x168
neat_bar_layer_set_corner_radius(s_neat_bar_layer, 3);
neat_bar_layer_set_floating(s_neat_bar_layer, 4);
neat_bar_layer_set_height(s_neat_bar_layer, 123);
neat_bar_layer_set_y_offset(s_neat_bar_layer, 41);
neat_bar_layer_set_spread(s_neat_bar_layer, -10);
neat_bar_layer_set_bar_width(s_neat_bar_layer, NEAT_BAR_WIDTH);
#if PBL_ROUND
neat_bar_layer_set_bar_style(s_neat_bar_layer, false);
neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 15);
neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, PBL_DISPLAY_HEIGHT >= 260 ? 60 : 54);
neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT >= 260 ? 140 : 72);
#else
neat_bar_layer_set_icons_x_offset(s_neat_bar_layer, 0);
neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 3);
neat_bar_layer_set_rect_bar_floating(s_neat_bar_layer, 4);
neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 41);
neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT >= 228 ? 183 : 123);
#if PBL_DISPLAY_HEIGHT == 168
neat_bar_layer_set_icons_spread(s_neat_bar_layer, 36);
#endif
#endif
neat_bar_layer_set_click_config_provider(s_neat_bar_layer, click_config_provider);
neat_bar_layer_add_to_window(s_neat_bar_layer, window);
@@ -192,6 +188,8 @@ static void main_window_load(Window *window) {
s_logo_layer = bitmap_layer_create(s_logo_start);
#if PBL_COLOR
bitmap_layer_set_compositing_mode(s_logo_layer, GCompOpSet);
#else
bitmap_layer_set_background_color(s_logo_layer, s_color_primary);
#endif
bitmap_layer_set_bitmap(s_logo_layer, s_logo_icon);