Merge branch 'master' into feature/heif

.cargo/config.toml

@@ -0,0 +1,8 @@
+# [build]
+# rustflags = ["-C", "link-arg=-fuse-ld=lld"]
+
+# [profile.dev]
+# lto = "off"
+
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/check_arm7.yml

@@ -9,6 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
+      - uses: Swatinem/rust-cache@v2
 
       - name: Update Rust
         run: rustup update

.github/workflows/check_osx.yml

@@ -10,9 +10,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ilammy/setup-nasm@v1
+      - uses: Swatinem/rust-cache@v2
+        
+
+        
+  
 
-      # - name: cargo build 
-      #   run: cargo build
 
       - name: Check without default features
         run: cargo check --no-default-features

.github/workflows/check_ubuntu_no_default_features.yml

@@ -11,6 +11,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ilammy/setup-nasm@v1
+      - uses: Swatinem/rust-cache@v2
+
         
       - name: Patch azure linux deps
         run: sudo apt update

.github/workflows/check_windows.yml

@@ -10,7 +10,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ilammy/setup-nasm@v1
-        
+      - uses: Swatinem/rust-cache@v2
+      
       - name: Install vcpkg
         run: vcpkg integrate install
 

.gitignore

@@ -11,6 +11,4 @@ perf.*
 flamegraph.svg
 .notes
 TODO
-# for dev profile optimisations
-.cargo/config.toml
 debug.png

Cargo.toml

@@ -34,7 +34,7 @@ gif-dispose = "4"
 image = "0.24"
 kamadak-exif = "0.5"
 lexical-sort = "0.3"
-libavif-image = {version = "0.10", optional = true}
+libavif-image = {version = "0.11", optional = true}
 libwebp-sys = "0.9.2"
 log = "0.4"
 nalgebra = "0.32"
@@ -60,13 +60,13 @@ usvg = "0.33.0"
 webbrowser = "0.8"
 tiff = "0.9"
 jxl-oxide = "0.4"
-zune-png = "0.2"
+zune-png = "0.4"
 img-parts = "0.3.0"
 dark-light = "1.0.0"
 trash = "3.1"
 lutgen = {version ="0.9.0", features = ["lutgen-palettes"]}
 libheif-rs = { version = "0.22.0", default-features = false, optional = true}
-egui-phosphor = "0.3.0"
+egui-phosphor = "=0.3.0"
 
 [env]
 PKG_CONFIG_PATH = "libheif/build"

src/main.rs

@@ -259,6 +259,11 @@ fn init(gfx: &mut Graphics, plugins: &mut Plugins) -> OculanteState {
             .insert(0, "my_font".to_owned());
 
         egui_phosphor::add_to_fonts(&mut fonts, egui_phosphor::Variant::Regular);
+        match state.persistent_settings.theme {
+            ColorTheme::Light => ctx.set_visuals(Visuals::light()),
+            ColorTheme::Dark => ctx.set_visuals(Visuals::dark()),
+            ColorTheme::System => set_system_theme(ctx),
+        }
 
         let mut style: egui::Style = (*ctx.style()).clone();
         let font_scale = 0.80;
@@ -267,6 +272,7 @@ fn init(gfx: &mut Graphics, plugins: &mut Plugins) -> OculanteState {
         style.text_styles.get_mut(&TextStyle::Button).unwrap().size = 18. * font_scale;
         style.text_styles.get_mut(&TextStyle::Small).unwrap().size = 15. * font_scale;
         style.text_styles.get_mut(&TextStyle::Heading).unwrap().size = 22. * font_scale;
+        debug!("Accent color: {:?}",state.persistent_settings.accent_color);
         style.visuals.selection.bg_fill = Color32::from_rgb(
             state.persistent_settings.accent_color[0],
             state.persistent_settings.accent_color[1],
@@ -283,14 +289,10 @@ fn init(gfx: &mut Graphics, plugins: &mut Plugins) -> OculanteState {
         let accent_color_luma = if accent_color_luma < 80 { 220 } else { 80 };
         // Set text on highlighted elements
         style.visuals.selection.stroke = Stroke::new(2.0, Color32::from_gray(accent_color_luma));
-        ctx.set_style(style);
         ctx.set_fonts(fonts);
-
-        match state.persistent_settings.theme {
-            ColorTheme::Light => ctx.set_visuals(Visuals::light()),
-            ColorTheme::Dark => ctx.set_visuals(Visuals::dark()),
-            ColorTheme::System => set_system_theme(ctx),
-        }
+        
+  
+        ctx.set_style(style);
     });
 
     // load checker texture