Release Inbe 1.8.10
- Migrate src/storage/import.c to Kry (import.kry -> import_impl.c) - Bump Kryon vendor to 22afa31 (persistent text input focus, minimal Kry language with sugar verbs removed) - Rework desktop close behavior: disable raylib ESC-to-exit on native; tray builds route close through the keep-running/quit prompt, non-tray builds quit immediately on window close - Habits editor description scroll state - Screen/settings UI refinements across habits, pet, practice, profile, language, manual, and settings screens
This commit is contained in:
1 parent
f86b264c0a
commit
83800a8886
24 files changed
+189
-101
No files matched your search
@@ -8,6 +8,7 @@
|
||||
.claude/
|
||||
.local/
|
||||
.codex/
|
||||
.zcode
|
||||
.agents/
|
||||
.cache/
|
||||
.ccache
|
||||
|
||||
@@ -1,4 +1,17 @@
|
||||
# Changelog
|
||||
## [1.8.10] - 2026-07-26
|
||||
### Changed
|
||||
- Migrated `src/storage/import.c` to Kry (`import.kry`, transpiled to `import_impl.c`), following the established `db.kry` pattern; the hand-written `import.h` remains the public contract.
|
||||
- Bumped the Kryon vendor to `22afa31` (text input focus is now persistent and single-owner across frames; Kry language is now minimal with sugar verbs removed; website Platforms grid refreshed).
|
||||
- Reworked the desktop close behavior: raylib's built-in ESC-to-exit is now disabled on native/desktop (ESC is handled per-screen, and close goes through our own keep-running/quit prompt when a tray is present); without a tray the window close button quits immediately.
|
||||
- Habits editor: added description scroll state so long descriptions scroll correctly.
|
||||
- Renamed a shadowed `text` parameter in `copy_text_checked` to `input` for clarity (meditation music path).
|
||||
- Various screen and settings UI refinements across habits edit, pet, practice, profile, language, manual, and settings screens.
|
||||
- Added `.zcode` to `.gitignore`.
|
||||
|
||||
### Note
|
||||
- Meditation audio asset refresh is held back from this release (requires `git-lfs` to be installed locally before committing); will ship in a follow-up.
|
||||
|
||||
## [1.8.9] - 2026-07-17
|
||||
### Changed
|
||||
- Fixed Android native builds by embedding the current Noto font sources instead of stale generated `assets/fonts/ui.*` files.
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
Changed
|
||||
---
|
||||
- Migrated `src/storage/import.c` to Kry (`import.kry`, transpiled to `import_impl.c`), following the established `db.kry` pattern; the hand-written `import.h` remains the public contract.
|
||||
- Bumped the Kryon vendor to `22afa31` (text input focus is now persistent and single-owner across frames; Kry language is now minimal with sugar verbs removed; website Platforms grid refreshed).
|
||||
- Reworked the desktop close behavior: raylib's built-in ESC-to-exit is now disabled on native/desktop (ESC is handled per-screen, and close goes through our own keep-running/quit prompt when a tray is present); without a tray the window close button quits immediately.
|
||||
- Habits editor: added description scroll state so long descriptions scroll correctly.
|
||||
- Renamed a shadowed `text` parameter in `copy_text_checked` to `input` for clarity (meditation music path).
|
||||
- Various screen and settings UI refinements across habits edit, pet, practice, profile, language, manual, and settings screens.
|
||||
- Added `.zcode` to `.gitignore`.
|
||||
@@ -1,5 +1,5 @@
|
||||
Package: inbe.waozi
|
||||
Version: 1.8.9
|
||||
Version: 1.8.10
|
||||
Architecture: arm64
|
||||
Maintainer: Waozi <[email protected]>
|
||||
Click-Version: 0.4
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<binary>inbe</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="1.8.9" date="2026-07-17"/>
|
||||
<release version="1.8.10" date="2026-07-26"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "inbe",
|
||||
"title": "Inner Breeze",
|
||||
"version": "1.8.9",
|
||||
"version": "1.8.10",
|
||||
"architecture": "arm64",
|
||||
"framework": "ubuntu-sdk-20.04",
|
||||
"description": "Syncable breathing, meditation, and habit practice app.",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"manifest_version": 3,
|
||||
"name": "Inner Breeze",
|
||||
"short_name": "Inbe",
|
||||
"version": "1.8.9",
|
||||
"version": "1.8.10",
|
||||
"description": "Breathing, meditation, habit tracking, and encrypted sync.",
|
||||
"permissions": [
|
||||
"contextMenus"
|
||||
|
||||
@@ -304,6 +304,7 @@ typedef struct HabitEditState {
|
||||
int index;
|
||||
int cursor;
|
||||
int description_cursor;
|
||||
int description_scroll_y;
|
||||
int focused;
|
||||
int description_focused;
|
||||
char text[INBE_HABIT_NAME_SIZE];
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
|
||||
#define INBE_VERSION_MAJOR 1
|
||||
#define INBE_VERSION_MINOR 8
|
||||
#define INBE_VERSION_PATCH 9
|
||||
#define INBE_VERSION_STRING "1.8.9"
|
||||
#define INBE_VERSION_PATCH 10
|
||||
#define INBE_VERSION_STRING "1.8.10"
|
||||
|
||||
#endif
|
||||
+15
-13
@@ -728,6 +728,12 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
|
||||
set_desktop_window_icon();
|
||||
#if !defined(PLATFORM_WEB) && !ANDROID_BUILD
|
||||
/* Disable raylib's built-in ESC-to-exit. We surface close requests through
|
||||
* our own "keep running / quit?" prompt (see app_request_desktop_close),
|
||||
* and ESC is already handled by individual screens via IsKeyPressed. */
|
||||
SetExitKey(0);
|
||||
#endif
|
||||
InitUIDPI();
|
||||
app_init(&inbe_app);
|
||||
set_global_inbe_app(&inbe_app);
|
||||
@@ -763,6 +769,11 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
|
||||
#if defined(INBE_DESKTOP_TRAY_ENABLED)
|
||||
/* With a tray, the close button asks whether to keep running in the
|
||||
* background (hiding to tray) or quit. The SDL_QUIT that raylib would
|
||||
* otherwise latch is already swallowed by the tray's event filter, so
|
||||
* WindowShouldClose() can only become true via a stray path; guard the
|
||||
* re-fire so the prompt never pops again while already open. */
|
||||
while(!quit) {
|
||||
InbeDesktopTrayAction tray_action = inbe_desktop_tray_poll_action();
|
||||
AppClosePromptResult close_result;
|
||||
@@ -782,25 +793,16 @@ int main(int argc, char **argv) {
|
||||
tray_action = inbe_desktop_tray_poll_action();
|
||||
if(tray_action != INBE_DESKTOP_TRAY_ACTION_NONE)
|
||||
inbe_desktop_tray_apply_action(&inbe_app, tray_action, &quit);
|
||||
if(WindowShouldClose())
|
||||
if(WindowShouldClose() && !inbe_app.close_prompt_open)
|
||||
app_request_desktop_close(&inbe_app);
|
||||
}
|
||||
#else
|
||||
/* No tray: there is nothing to keep running in the background, so a close
|
||||
* request (window button, WM, or signal) just quits. No prompt. */
|
||||
while(!g_shutdown_requested && !quit) {
|
||||
AppClosePromptResult close_result;
|
||||
frame();
|
||||
close_result = app_consume_close_prompt_result(&inbe_app);
|
||||
if(close_result == AppClosePromptKeepRunning)
|
||||
MinimizeWindow();
|
||||
else if(close_result == AppClosePromptQuit)
|
||||
if(WindowShouldClose() || g_shutdown_requested)
|
||||
quit = 1;
|
||||
if(WindowShouldClose()) {
|
||||
#if ANDROID_BUILD
|
||||
quit = 1;
|
||||
#else
|
||||
app_request_desktop_close(&inbe_app);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -101,23 +101,23 @@ known_track_archive_member :: (path: const char*) -> int #private {
|
||||
return 0
|
||||
}
|
||||
|
||||
copy_text_checked :: (out: char*, out_size: size_t, text: const char*) -> int #private {
|
||||
copy_text_checked :: (out: char*, out_size: size_t, input: const char*) -> int #private {
|
||||
len: size_t
|
||||
|
||||
if out == nil || out_size == 0 {
|
||||
return 0
|
||||
}
|
||||
if text == nil {
|
||||
text = ""
|
||||
if input == nil {
|
||||
input = ""
|
||||
}
|
||||
|
||||
len = strlen(text)
|
||||
len = strlen(input)
|
||||
if len >= out_size {
|
||||
out[0] = '\0'
|
||||
return 0
|
||||
}
|
||||
|
||||
memcpy(out, text, len + 1)
|
||||
memcpy(out, input, len + 1)
|
||||
return 1
|
||||
}
|
||||
|
||||
|
||||
+49
-17
@@ -288,6 +288,33 @@ text_field :: (text: char*, text_size: size_t, cursor: int*,
|
||||
}
|
||||
}
|
||||
|
||||
text_area :: (text: char*, text_size: size_t, cursor: int*,
|
||||
focused: int*, scroll_y: int*, max_codepoints: int,
|
||||
font: int) -> UITextArea #private {
|
||||
style: UITextInputStyle = {
|
||||
.background = DarkenUIColor(GetThemeBackground(), 4),
|
||||
.border = GetThemeButton(),
|
||||
.focus_border = GetThemeButtonHover(),
|
||||
.text = GetThemeText(),
|
||||
.cursor = GetThemeText(),
|
||||
.radius = 0.08f,
|
||||
.padding_x = ScaleUIPx(10)
|
||||
}
|
||||
|
||||
return (UITextArea){
|
||||
.bounds = {0},
|
||||
.text = text,
|
||||
.text_size = text_size,
|
||||
.cursor_position = cursor,
|
||||
.focused = focused,
|
||||
.scroll_y = scroll_y,
|
||||
.max_codepoints = max_codepoints,
|
||||
.font = font,
|
||||
.line_gap = ScaleUIPx(4),
|
||||
.style = style
|
||||
}
|
||||
}
|
||||
|
||||
color_button :: (app: InbeApp*, x: int, y: int, color: Color,
|
||||
selected: int) -> int #private {
|
||||
mouse_world := GetScreenToWorld2D(GetMousePosition(), app->camera)
|
||||
@@ -328,10 +355,7 @@ scroll_content_height :: (content_w: int, user_data: void*) -> int #private {
|
||||
.label = GetLocaleText("habit_name_label"),
|
||||
.field_h = ScaleUIPx(40)
|
||||
})
|
||||
height += GetUILabelTextFieldHeight((UILabelTextField){
|
||||
.label = GetLocaleText("habit_description_label"),
|
||||
.field_h = ScaleUIPx(40)
|
||||
})
|
||||
height += ScaleUIPx(22) + ScaleUIPx(120) + ScaleUIPx(24)
|
||||
height += ScaleUIPx(32) + ScaleUIPx(76)
|
||||
height += GetUISectionLabelHeight((UISectionLabel){0})
|
||||
for int i = 0; i < EXERCISE_COUNT; i++ {
|
||||
@@ -380,6 +404,7 @@ draw :: (app: InbeApp*) {
|
||||
font := GetUIFontSize()
|
||||
label_font := GetUISmallFontSize()
|
||||
field_h := ScaleUIPx(40)
|
||||
desc_field_h := ScaleUIPx(120)
|
||||
hover := 0
|
||||
title_font := 0
|
||||
title_w := 0
|
||||
@@ -509,21 +534,28 @@ draw :: (app: InbeApp*) {
|
||||
clamp_cursor(app->habit_edit.text, &app->habit_edit.cursor)
|
||||
y += GetUILabelTextFieldHeight((UILabelTextField){.field_h = field_h})
|
||||
|
||||
DrawUILabelTextField((UILabelTextField){
|
||||
.label = GetLocaleText("habit_description_label"),
|
||||
.field = text_field(app->habit_edit.description,
|
||||
sizeof(app->habit_edit.description),
|
||||
&app->habit_edit.description_cursor,
|
||||
&app->habit_edit.description_focused,
|
||||
INBE_HABIT_DESCRIPTION_SIZE - 1,
|
||||
font),
|
||||
.field_h = field_h,
|
||||
.label_font = label_font,
|
||||
.label_color = DarkenUIColor(GetThemeText(), 34)
|
||||
}, content_x, y, content_w)
|
||||
desc_label_h := ScaleUIPx(22)
|
||||
desc_label_gap := 0
|
||||
desc_bottom_gap := ScaleUIPx(24)
|
||||
DrawUIText(GetLocaleText("habit_description_label"), content_x, y,
|
||||
label_font, DarkenUIColor(GetThemeText(), 34))
|
||||
desc_area := text_area(app->habit_edit.description,
|
||||
sizeof(app->habit_edit.description),
|
||||
&app->habit_edit.description_cursor,
|
||||
&app->habit_edit.description_focused,
|
||||
&app->habit_edit.description_scroll_y,
|
||||
INBE_HABIT_DESCRIPTION_SIZE - 1,
|
||||
font)
|
||||
desc_area.bounds = (Rectangle){
|
||||
(float)content_x,
|
||||
(float)(y + desc_label_h + desc_label_gap),
|
||||
(float)content_w,
|
||||
(float)desc_field_h
|
||||
}
|
||||
DrawUITextArea(desc_area)
|
||||
clamp_cursor(app->habit_edit.description,
|
||||
&app->habit_edit.description_cursor)
|
||||
y += GetUILabelTextFieldHeight((UILabelTextField){.field_h = field_h})
|
||||
y += desc_label_h + desc_label_gap + desc_field_h + desc_bottom_gap
|
||||
|
||||
DrawUIText(GetLocaleText("habit_underline_label"), content_x, y,
|
||||
label_font, DarkenUIColor(GetThemeText(), 34))
|
||||
|
||||
@@ -38,7 +38,7 @@ language_screen_draw :: (app: InbeApp*) {
|
||||
button_x = view_width / 2
|
||||
button_y = dropdown_y + ScaleUIPx(64)
|
||||
|
||||
on DrawUILocaleDropdownButton(200, dropdown_x, dropdown_y, dropdown_w, dropdown_h, selected_index) {
|
||||
if DrawUILocaleDropdownButton(200, dropdown_x, dropdown_y, dropdown_w, dropdown_h, selected_index) {
|
||||
selection_changed = 1
|
||||
}
|
||||
|
||||
@@ -46,13 +46,13 @@ language_screen_draw :: (app: InbeApp*) {
|
||||
title_w = MeasureUIText(GetLocaleText("language_picker_title"), title_font)
|
||||
DrawUIText(GetLocaleText("language_picker_title"), view_width / 2 - title_w / 2, ScaleUIPx(28), title_font, GetThemeText())
|
||||
DrawUIText(GetLocaleText("language_label"), dropdown_x, dropdown_y - ScaleUIPx(24), label_font, GetThemeText())
|
||||
on DrawUITextButton(button_x, button_y, GetLocaleText("next_button"), &next_hover) {
|
||||
if DrawUITextButton(button_x, button_y, GetLocaleText("next_button"), &next_hover) {
|
||||
app->main_tab = APP_MAIN_TAB_PRACTICE
|
||||
app->practice_tab = PRACTICE_TAB_PLAY
|
||||
app_switch_screen(app, InbeScreenStart)
|
||||
}
|
||||
|
||||
on DrawUIDropdownMenu(200) {
|
||||
if DrawUIDropdownMenu(200) {
|
||||
selection_changed = 1
|
||||
}
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ manual_screen_guide_draw_nav :: (app: InbeApp*, nav: ManualGuideNav) {
|
||||
snprintf(page_label, sizeof(page_label), "%d / %d", page + 1, nav.page_count)
|
||||
DrawCenteredUIControlText(page_label, view_width / 2, nav.y + nav.h / 2, page_font, GetThemeText())
|
||||
if page > 0 || nav.show_left_on_first {
|
||||
on DrawUIIconButton((UIIconButton){
|
||||
if DrawUIIconButton((UIIconButton){
|
||||
.bounds = {
|
||||
(float)side_pad,
|
||||
(float)button_y,
|
||||
@@ -127,7 +127,7 @@ manual_screen_guide_draw_nav :: (app: InbeApp*, nav: ManualGuideNav) {
|
||||
}
|
||||
}
|
||||
|
||||
on DrawUIIconButton((UIIconButton){
|
||||
if DrawUIIconButton((UIIconButton){
|
||||
.bounds = {
|
||||
(float)(view_width - side_pad - button_size),
|
||||
(float)button_y,
|
||||
|
||||
@@ -27,18 +27,28 @@ pet_screen_draw :: (app: InbeApp*) {
|
||||
text_y := 0
|
||||
muted := DarkenUIColor(GetThemeText(), 34)
|
||||
|
||||
clamp_min content_h ScaleUIPx(120)
|
||||
if content_h < ScaleUIPx(120) {
|
||||
content_h = ScaleUIPx(120)
|
||||
}
|
||||
center_y = content_h / 2 - ScaleUIPx(18)
|
||||
|
||||
egg_size = view_width < view_height ? view_width : view_height
|
||||
egg_size = egg_size * 42 / 100
|
||||
clamp_min egg_size ScaleUIPx(120)
|
||||
clamp_max egg_size ScaleUIPx(240)
|
||||
if egg_size < ScaleUIPx(120) {
|
||||
egg_size = ScaleUIPx(120)
|
||||
}
|
||||
if egg_size > ScaleUIPx(240) {
|
||||
egg_size = ScaleUIPx(240)
|
||||
}
|
||||
|
||||
pet.draw_egg(app, center_x, center_y, egg_size)
|
||||
text_w = view_width - ScaleUIPx(48)
|
||||
clamp_max text_w ScaleUIPx(360)
|
||||
clamp_min text_w ScaleUIPx(160)
|
||||
if text_w > ScaleUIPx(360) {
|
||||
text_w = ScaleUIPx(360)
|
||||
}
|
||||
if text_w < ScaleUIPx(160) {
|
||||
text_w = ScaleUIPx(160)
|
||||
}
|
||||
text_x = center_x - text_w / 2
|
||||
text_y = center_y + egg_size / 2 + ScaleUIPx(28)
|
||||
|
||||
|
||||
@@ -108,7 +108,9 @@ practice_screen_config_layout :: (app: InbeApp*, modal_type: int, content_top_ga
|
||||
if layout == NULL {
|
||||
return
|
||||
}
|
||||
clamp_min scroll_h 0
|
||||
if scroll_h < 0 {
|
||||
scroll_h = 0
|
||||
}
|
||||
*layout = (PracticeSubscreenLayout){integrated, title_h, scroll_y, scroll_h}
|
||||
}
|
||||
|
||||
@@ -355,11 +357,11 @@ practice_draw_home_carousel_controls :: (app: InbeApp*, x: int, y: int, w: int)
|
||||
dots_x = x
|
||||
dots_w = w
|
||||
}
|
||||
icon_button .bounds = {(float)x, (float)arrow_y, (float)arrow, (float)arrow}, .icon = app->icons[UI_ICON_TYPE_LEFT], .icon_size = arrow - ScaleUIPx(18), .icon_padding = ScaleUIPx(9), .background = arrow_bg, .hover_background = arrow_hover, .border = arrow_border, .icon_color = arrow_icon, .radius = 0.22f {
|
||||
if DrawUIIconButton((UIIconButton){.bounds = {(float)x, (float)arrow_y, (float)arrow, (float)arrow}, .icon = app->icons[UI_ICON_TYPE_LEFT], .icon_size = arrow - ScaleUIPx(18), .icon_padding = ScaleUIPx(9), .background = arrow_bg, .hover_background = arrow_hover, .border = arrow_border, .icon_color = arrow_icon, .radius = 0.22f}) {
|
||||
practice_select_home_card(app, practice_next_visible(app, -1))
|
||||
}
|
||||
practice_draw_home_dots(app, dots_x, y + (row_h - practice_home_dots_height(app)) / 2, dots_w)
|
||||
icon_button .bounds = {(float)(x + w - arrow), (float)arrow_y, (float)arrow, (float)arrow}, .icon = app->icons[UI_ICON_TYPE_RIGHT], .icon_size = arrow - ScaleUIPx(18), .icon_padding = ScaleUIPx(9), .background = arrow_bg, .hover_background = arrow_hover, .border = arrow_border, .icon_color = arrow_icon, .radius = 0.22f {
|
||||
if DrawUIIconButton((UIIconButton){.bounds = {(float)(x + w - arrow), (float)arrow_y, (float)arrow, (float)arrow}, .icon = app->icons[UI_ICON_TYPE_RIGHT], .icon_size = arrow - ScaleUIPx(18), .icon_padding = ScaleUIPx(9), .background = arrow_bg, .hover_background = arrow_hover, .border = arrow_border, .icon_color = arrow_icon, .radius = 0.22f}) {
|
||||
practice_select_home_card(app, practice_next_visible(app, 1))
|
||||
}
|
||||
}
|
||||
@@ -367,8 +369,12 @@ practice_draw_home_carousel_controls :: (app: InbeApp*, x: int, y: int, w: int)
|
||||
practice_home_card_height :: (y: int, bottom_reserved: int) -> int #private {
|
||||
card_h := view_height - y - bottom_reserved - ScaleUIPx(176)
|
||||
|
||||
clamp_min card_h ScaleUIPx(180)
|
||||
clamp_max card_h ScaleUIPx(300)
|
||||
if card_h < ScaleUIPx(180) {
|
||||
card_h = ScaleUIPx(180)
|
||||
}
|
||||
if card_h > ScaleUIPx(300) {
|
||||
card_h = ScaleUIPx(300)
|
||||
}
|
||||
return card_h
|
||||
}
|
||||
|
||||
@@ -751,7 +757,9 @@ practice_home_layout :: (app: InbeApp*, card: Rectangle*, start: Rectangle*, man
|
||||
btn_h := ScaleUIPx(42)
|
||||
gap := 0
|
||||
|
||||
clamp_max content_w max_w
|
||||
if content_w > max_w {
|
||||
content_w = max_w
|
||||
}
|
||||
if content_w < ScaleUIPx(260) {
|
||||
content_w = view_width - ScaleUIPx(16)
|
||||
}
|
||||
@@ -859,11 +867,15 @@ page start(app: InbeApp*) {
|
||||
bottom_reserved = app_content_bottom_reserved(app)
|
||||
scroll_y = 0
|
||||
scroll_h = view_height - scroll_y - bottom_reserved
|
||||
clamp_min scroll_h 0
|
||||
if scroll_h < 0 {
|
||||
scroll_h = 0
|
||||
}
|
||||
|
||||
practice = practice_get(app->exercise_type)
|
||||
content_w = view_width - ScaleUIPx(24)
|
||||
clamp_max content_w ScaleUIPx(480)
|
||||
if content_w > ScaleUIPx(480) {
|
||||
content_w = ScaleUIPx(480)
|
||||
}
|
||||
if content_w < ScaleUIPx(260) {
|
||||
content_w = view_width - ScaleUIPx(16)
|
||||
}
|
||||
@@ -882,55 +894,55 @@ page start(app: InbeApp*) {
|
||||
app->practice_home_scroll = 0
|
||||
}
|
||||
|
||||
draw practice_draw_home_title(app, x, y, content_w)
|
||||
advance y by practice_home_title_height(app) + ScaleUIPx(10)
|
||||
advance layout_y by practice_home_title_height(app) + ScaleUIPx(10)
|
||||
practice_draw_home_title(app, x, y, content_w)
|
||||
y += practice_home_title_height(app) + ScaleUIPx(10)
|
||||
layout_y += practice_home_title_height(app) + ScaleUIPx(10)
|
||||
|
||||
card_w = content_w
|
||||
card_h = practice_home_card_height(layout_y, bottom_reserved)
|
||||
card := (Rectangle){(float)x, (float)y, (float)card_w, (float)card_h}
|
||||
texture banner = practice_card_banner(app, app->exercise_type)
|
||||
banner: Texture2D = practice_card_banner(app, app->exercise_type)
|
||||
if banner.id != 0 {
|
||||
draw practice_draw_card_banner(banner, card)
|
||||
practice_draw_card_banner(banner, card)
|
||||
} else {
|
||||
draw DrawRectangleGradientV(x, y, card_w, card_h, practice_card_color_top(app->exercise_type), practice_card_color_bottom(app->exercise_type))
|
||||
DrawRectangleGradientV(x, y, card_w, card_h, practice_card_color_top(app->exercise_type), practice_card_color_bottom(app->exercise_type))
|
||||
}
|
||||
draw DrawRectangleLinesEx(card, ScaleUIPx(2), LightenUIColor(GetThemeBackground(), 55))
|
||||
DrawRectangleLinesEx(card, ScaleUIPx(2), LightenUIColor(GetThemeBackground(), 55))
|
||||
|
||||
carousel_count = practice_visible_count(app)
|
||||
advance y by card_h
|
||||
y += card_h
|
||||
if carousel_count > 1 {
|
||||
draw practice_draw_home_carousel_controls(app, x, y, content_w)
|
||||
advance y by practice_home_carousel_controls_height(app)
|
||||
practice_draw_home_carousel_controls(app, x, y, content_w)
|
||||
y += practice_home_carousel_controls_height(app)
|
||||
}
|
||||
advance y by ScaleUIPx(10)
|
||||
y += ScaleUIPx(10)
|
||||
|
||||
button x, y, content_w, btn_h, GetLocaleText("practice_start_button"), UI_BUTTON_STYLE_PRIMARY, 0, &hover {
|
||||
if WidgetButton(x, y, content_w, btn_h, GetLocaleText("practice_start_button"), UI_BUTTON_STYLE_PRIMARY) {
|
||||
if practice->start != NULL {
|
||||
practice->start(app)
|
||||
}
|
||||
}
|
||||
advance y by btn_h + gap
|
||||
y += btn_h + gap
|
||||
|
||||
if practice_home_actions_share_row(practice, content_w) {
|
||||
row_gap = practice_home_action_gap(content_w)
|
||||
practice_home_action_row_widths(content_w, &manual_w, &config_w)
|
||||
button x, y, manual_w, btn_h, GetLocaleText("practice_manual_button"), UI_BUTTON_STYLE_SECONDARY, 0, &hover {
|
||||
if WidgetButton(x, y, manual_w, btn_h, GetLocaleText("practice_manual_button"), UI_BUTTON_STYLE_SECONDARY) {
|
||||
practice_screen_open_tab(app, PRACTICE_TAB_MANUAL)
|
||||
}
|
||||
|
||||
button x + manual_w + row_gap, y, config_w, btn_h, GetLocaleText("practice_configure_button"), UI_BUTTON_STYLE_SECONDARY, 0, &hover {
|
||||
if WidgetButton(x + manual_w + row_gap, y, config_w, btn_h, GetLocaleText("practice_configure_button"), UI_BUTTON_STYLE_SECONDARY) {
|
||||
practice_screen_open_tab(app, PRACTICE_TAB_CONFIG)
|
||||
}
|
||||
} else {
|
||||
if practice->draw_manual != NULL {
|
||||
button x, y, content_w, btn_h, GetLocaleText("practice_manual_button"), UI_BUTTON_STYLE_SECONDARY, 0, &hover {
|
||||
if WidgetButton(x, y, content_w, btn_h, GetLocaleText("practice_manual_button"), UI_BUTTON_STYLE_SECONDARY) {
|
||||
practice_screen_open_tab(app, PRACTICE_TAB_MANUAL)
|
||||
}
|
||||
advance y by btn_h + gap
|
||||
y += btn_h + gap
|
||||
}
|
||||
if practice->draw_config != NULL {
|
||||
button x, y, content_w, btn_h, GetLocaleText("practice_configure_button"), UI_BUTTON_STYLE_SECONDARY, 0, &hover {
|
||||
if WidgetButton(x, y, content_w, btn_h, GetLocaleText("practice_configure_button"), UI_BUTTON_STYLE_SECONDARY) {
|
||||
practice_screen_open_tab(app, PRACTICE_TAB_CONFIG)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -295,7 +295,7 @@ profile_screen_draw :: (app: InbeApp*) -> int {
|
||||
title = GetLocaleText("profile_my_habits_title")
|
||||
}
|
||||
|
||||
on app_draw_close_title_bar(app, title, header_h) {
|
||||
if app_draw_close_title_bar(app, title, header_h) {
|
||||
app->profile_scroll = 0
|
||||
app->sync_server_url_focused = 0
|
||||
if app_return_to_nav_sidebar_if_needed(app) {
|
||||
@@ -317,7 +317,9 @@ profile_screen_draw :: (app: InbeApp*) -> int {
|
||||
}
|
||||
}
|
||||
|
||||
clamp_min content_h 0
|
||||
if content_h < 0 {
|
||||
content_h = 0
|
||||
}
|
||||
page = BeginUIScrollPage((UIScrollPageSpec){
|
||||
.y = content_y,
|
||||
.height = content_h,
|
||||
@@ -344,10 +346,10 @@ profile_screen_draw :: (app: InbeApp*) -> int {
|
||||
} else {
|
||||
settings_sync_account_draw_config(app, page.content_x, page.content_w, &y)
|
||||
}
|
||||
ScrollEnd(page)
|
||||
EndUIScrollPage(page)
|
||||
SetUIDropdownClipTop(content_y)
|
||||
SetUIDropdownClipBottom(view_height - app_content_bottom_reserved(app))
|
||||
on DrawUIDropdownMenu(812) {
|
||||
if DrawUIDropdownMenu(812) {
|
||||
app->profile_view = PROFILE_VIEW_MAIN
|
||||
app->profile_scroll = 0
|
||||
}
|
||||
@@ -356,7 +358,7 @@ profile_screen_draw :: (app: InbeApp*) -> int {
|
||||
if app->profile_view == PROFILE_VIEW_MAIN && (app->profile_tab == PROFILE_TAB_LEADERBOARD || app->profile_tab == PROFILE_TAB_FRIENDS) {
|
||||
SetUIDropdownClipTop(content_y)
|
||||
SetUIDropdownClipBottom(view_height - app_content_bottom_reserved(app))
|
||||
on DrawUIDropdownMenu(811) {
|
||||
if DrawUIDropdownMenu(811) {
|
||||
profile_social_load_leaderboard_cache(app)
|
||||
app->profile_scroll = 0
|
||||
}
|
||||
|
||||
@@ -691,7 +691,7 @@ draw_sync_review_modal :: (app: InbeApp*) -> int {
|
||||
diff_content_h: int = ScaleUIPx(40)
|
||||
p: const char* = nil
|
||||
diff_view: UIScrollView
|
||||
line: char* = nil
|
||||
diff_line: char* = nil
|
||||
line_y: int
|
||||
line_color: Color
|
||||
|
||||
@@ -761,23 +761,23 @@ draw_sync_review_modal :: (app: InbeApp*) -> int {
|
||||
.wheel_step = ScaleUIPx(24)
|
||||
})
|
||||
|
||||
line = strtok(diff_detail, "\n")
|
||||
diff_line = strtok(diff_detail, "\n")
|
||||
line_y = diff_view.content_y
|
||||
while line != nil {
|
||||
while diff_line != nil {
|
||||
line_color = GetThemeText()
|
||||
if line[0] == '-' {
|
||||
if diff_line[0] == '-' {
|
||||
line_color = (Color){215, 88, 88, 255}
|
||||
} else if line[0] == '+' {
|
||||
} else if diff_line[0] == '+' {
|
||||
line_color = (Color){74, 170, 112, 255}
|
||||
}
|
||||
|
||||
DrawUIText(line,
|
||||
DrawUIText(diff_line,
|
||||
diff_view.content_x,
|
||||
line_y,
|
||||
GetUISmallFontSize(),
|
||||
line_color)
|
||||
line_y += ScaleUIPx(20)
|
||||
line = strtok(nil, "\n")
|
||||
diff_line = strtok(nil, "\n")
|
||||
}
|
||||
|
||||
EndUIScrollContainer((UIScrollArea){
|
||||
|
||||
@@ -127,7 +127,7 @@ settings_draw_section_header :: (app: InbeApp*, tab: int) #private {
|
||||
header_h := GetUITabBarHeight()
|
||||
title := settings_screen_tab_label(tab)
|
||||
|
||||
on app_draw_close_title_bar(app, title, header_h) {
|
||||
if app_draw_close_title_bar(app, title, header_h) {
|
||||
app->settings_scroll = 0
|
||||
if app->modal.type == UIModalThemePicker {
|
||||
app_close_modal(app)
|
||||
@@ -168,7 +168,9 @@ settings_screen_draw :: (app: InbeApp*) -> int {
|
||||
settings_data_handle_web_import(app)
|
||||
}
|
||||
|
||||
clamp_min content_viewport_h 0
|
||||
if content_viewport_h < 0 {
|
||||
content_viewport_h = 0
|
||||
}
|
||||
|
||||
settings_draw_section_header(app, app->settings_tab)
|
||||
page_ctx = (SettingsScrollPageContext){app, app->settings_tab}
|
||||
|
||||
@@ -58,7 +58,7 @@ draw :: (app: InbeApp*, x: int, w: int, y: int*, state: SettingsThemeState*) {
|
||||
transitions_enabled := 0
|
||||
app->transition_mode = clampi(app->transition_mode, APP_TRANSITION_NONE, APP_TRANSITION_FADE)
|
||||
transitions_enabled = app->transition_mode == APP_TRANSITION_FADE
|
||||
on ui.draw_toggle_row(x, w, y, GetLocaleText("transition_label"), &transitions_enabled) {
|
||||
if ui.draw_toggle_row(x, w, y, GetLocaleText("transition_label"), &transitions_enabled) {
|
||||
app->transition_mode = transitions_enabled ? APP_TRANSITION_FADE : APP_TRANSITION_NONE
|
||||
if app->transition_mode == APP_TRANSITION_NONE {
|
||||
ResetUITransition(&app->screen_transition)
|
||||
@@ -147,7 +147,7 @@ settings_screen_draw_theme_picker_modal :: (app: InbeApp*) #export {
|
||||
picker_h = GetUIThemePickerHeight(draw_w)
|
||||
scroll_area.content_height = picker_h
|
||||
scroll_view = BeginUIScrollContainer(scroll_area)
|
||||
on DrawUIThemePicker(scroll_view.content_x, scroll_view.content_y, scroll_view.content_w, app->dark_mode, &app->theme_id) {
|
||||
if DrawUIThemePicker(scroll_view.content_x, scroll_view.content_y, scroll_view.content_w, app->dark_mode, &app->theme_id) {
|
||||
app->theme_id = clampi(app->theme_id, 0, THEME_COUNT - 1)
|
||||
app_refresh_theme(app)
|
||||
app->settings_dirty = 1
|
||||
|
||||
@@ -28,7 +28,7 @@ draw_toggle_row :: (x: int, w: int, y: int*, label: const char*, value: int*) ->
|
||||
|
||||
row_h := toggle_row_height(label, w)
|
||||
label_y := *y
|
||||
draw DrawUIParagraph(label_paragraph(label, w), x, &label_y)
|
||||
DrawUIParagraph(label_paragraph(label, w), x, &label_y)
|
||||
label_h := label_y - *y
|
||||
|
||||
if DrawUIToggleSwitch(x, *y + label_h + ScaleUIPx(8), ScaleUIPx(56), ScaleUIPx(30), value, GetLocaleText("toggle_off"), GetLocaleText("toggle_on")) {
|
||||
|
||||
@@ -405,7 +405,9 @@ statistics_draw_view :: (app: InbeApp*, active: InbeHabit*, linked_ctx: HabitLin
|
||||
w := slot_w - ScaleUIPx(10)
|
||||
bar_y := y + chart_h - h - ScaleUIPx(22)
|
||||
|
||||
clamp_min w ScaleUIPx(4)
|
||||
if w < ScaleUIPx(4) {
|
||||
w = ScaleUIPx(4)
|
||||
}
|
||||
DrawRectangle(x, bar_y, w, h, weekday_counts[i] > 0 ? LightenUIColor(active->color, 12) : DarkenUIColor(GetThemeBackground(), 24))
|
||||
DrawUIText(labels[i], x + (w - MeasureUIText(labels[i], UI_TEXT_12)) / 2, y + chart_h - ScaleUIPx(18), UI_TEXT_12, DarkenUIColor(GetThemeText(), 18))
|
||||
}
|
||||
@@ -456,7 +458,9 @@ draw_statistics_content :: (app: InbeApp*, content_top: int) {
|
||||
}
|
||||
}
|
||||
|
||||
clamp_min scroll_h 0
|
||||
if scroll_h < 0 {
|
||||
scroll_h = 0
|
||||
}
|
||||
page_ctx = (StatisticsScrollPageContext){linked_ctx != NULL ? linked_ctx->count : 0}
|
||||
page = BeginUIScrollPage((UIScrollPageSpec){.y = scroll_y, .height = scroll_h, .max_content_width = max_w, .scroll_offset = &app->habits.scroll, .content_height = statistics_scroll_page_content_height, .user_data = &page_ctx})
|
||||
statistics_draw_view(app, active, linked_ctx, page.content_x, page.content_w, page.content_y + ScaleUIPx(8))
|
||||
|
||||
Vendored
+1
-1
Submodule vendor/kryon updated: 93913f12a3...22afa3105d.
+4
-4
@@ -3,8 +3,8 @@
|
||||
IDI_APP_ICON ICON "inbe.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,8,9,0
|
||||
PRODUCTVERSION 1,8,9,0
|
||||
FILEVERSION 1,8,10,0
|
||||
PRODUCTVERSION 1,8,10,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -21,11 +21,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "waozi"
|
||||
VALUE "FileDescription", "Inner Breeze"
|
||||
VALUE "FileVersion", "1.8.9"
|
||||
VALUE "FileVersion", "1.8.10"
|
||||
VALUE "InternalName", "inbe"
|
||||
VALUE "OriginalFilename", "inbe-windows-x86_64.exe"
|
||||
VALUE "ProductName", "Inner Breeze"
|
||||
VALUE "ProductVersion", "1.8.9"
|
||||
VALUE "ProductVersion", "1.8.10"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Reference in new issue
Block a user