Conversation
…app.timer.elapsed_f32
…e them from the property itself
extend stale time from 2 months to 3
- Added set_window_icon_data - Added set_taskbar_icon_data - Added window_icon_from_raw.rs Example
…Icon-From-includebytes Added ability to set Window/Taskbar icon from raw data
Increasing the time to a year
…havior that needs to be fixed
Merges upstream notan v0.14.0 and resolves conflicts by taking upstream as base and re-applying our custom patches: - iOS framebuffer restore + background resume fix - OpenGL texture ID retrieval (iOS/Android) - OpenGL ES shader output for iOS/Android - Nix flake + .direnv - Guard VERTEX_PROGRAM_POINT_SIZE behind wasm32 cfg - Remove duplicate DrawPrimitive::Points (now in upstream) Patches no longer needed (now upstream): - DrawPrimitive::Points + GL_PROGRAM_POINT_SIZE - shaderc shader compilation (now default feature) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
fand
force-pushed
the
feat/v0.14.0-rebase
branch
2 times, most recently
from
f3c9b03 to
8b5c713
Compare
- is_rt → _is_rt in notan_draw blended_pip - gl → _gl in notan_glow get_default_frame_buffer Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
fand
force-pushed
the
feat/v0.14.0-rebase
branch
from
8b5c713 to
1ac7177
Compare
- Format notan_glow/src/lib.rs - Remove useless u32::from() conversion in get_gl_texture_id Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
egui 0.32 removed ImageData::Font — the font atlas is now always ImageData::Color. Replace deleted match arms with unreachable! wildcards since ImageData is #[non_exhaustive]. This enables puffin_egui 0.30.0 (requires egui ^0.33.3) in downstream projects. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…o_lib - Replace match+wildcard with let-destructure since ImageData has only the Color variant in egui 0.33 (no #[non_exhaustive]) - Bump egui_demo_lib 0.31→0.33 to avoid duplicate egui versions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rebase our custom patches onto upstream notan v0.14.0 (was v0.9.5).
This brings egui 0.20 → 0.31, glow 0.12 → 0.16, and shaderc as a default feature.
This PR is created for https://github.com/invideoio/iv-pro-timeline/pull/387
Patches preserved
Patches dropped (now upstream)
DrawPrimitive::Points+GL_PROGRAM_POINT_SIZEAdditional fix
VERTEX_PROGRAM_POINT_SIZEbehind#[cfg(not(target_arch = "wasm32"))]— not a valid WebGL capability