Merge branch 'flxzt:main' into update_upstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,7 +28,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**  
  - OS: [e.g. Fedora 38,  Windows 11 22H2, ...]
- - App Version: [e.g. Rnote v0.8.1]
+ - App Version: [e.g. Rnote v0.8.2]
  - Installation Source: [e.g. Flatpak, Archlinux Community Repo, ...]
  - Desktop Environment: [e.g. Gnome 44.2]
 

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 rust-version = "1.70"
 authors = ["The Rnote Authors"]
@@ -17,8 +17,8 @@ homepage = "https://rnote.flxzt.net"
 repository = "https://github.com/flxzt/rnote"
 
 [workspace.dependencies]
-rnote-compose = { version="0.8.1", path = "crates/rnote-compose" }
-rnote-engine = { version="0.8.1", path = "crates/rnote-engine" }
+rnote-compose = { version="0.8.2", path = "crates/rnote-compose" }
+rnote-engine = { version="0.8.2", path = "crates/rnote-engine" }
 
 log = "0.4"
 pretty_env_logger = "0.5"

crates/rnote-compose/Cargo.toml

@@ -9,7 +9,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-ink-stroke-modeler-rs = { git = "https://github.com/flxzt/ink-stroke-modeler-rs", rev = "8871fbf5d104a7c5bf7ff7e6084e2fa5cc557fed" }
+ink-stroke-modeler-rs = { git = "https://github.com/flxzt/ink-stroke-modeler-rs", rev = "b67f11b2c174a9ae4a54c22313cf8c218ff0946a" }
 
 log = { workspace = true }
 anyhow = { workspace = true }

crates/rnote-engine/data/meson.build

@@ -65,20 +65,4 @@ fonts_files = files(
 )
 
 # install fonts
-install_data(fonts_files, install_dir: pkgdatadir / 'fonts')
-
-# fontconfig file
-message('Configuring fontconfig file')
-
-fc_conf = configuration_data()
-fc_conf.set('APP_ID', app_id)
-fc_conf.set('APP_NAME', app_name)
-fc_conf.set('APP_NAME_CAPITALIZED', app_name_capitalized)
-fc_conf.set('PKG_DATA_DIR', pkgdatadir)
-fc_file_in = configure_file(
-    input: '09-fc.conf.in',
-    output: '09-' + app_name + '.conf',
-    configuration: fc_conf,
-    install: true,
-    install_dir: sysconfdir / 'fonts/conf.d',
-)
+install_data(fonts_files, install_dir: datadir / 'fonts' / app_name + '-fonts')

crates/rnote-engine/src/ext.rs

@@ -1,7 +1,7 @@
 // Imports
 use rnote_compose::eventresult::EventPropagation;
 
-/// Extension trait for [gdk::RGBA].
+/// Extension trait for [gtk4::gdk::RGBA].
 #[cfg(feature = "ui")]
 pub trait GdkRGBAExt
 where
@@ -47,7 +47,7 @@ impl GdkRGBAExt for gtk4::gdk::RGBA {
     }
 }
 
-/// Extension trait for [graphene::Rect].
+/// Extension trait for [gtk4::graphene::Rect].
 #[cfg(feature = "ui")]
 pub trait GrapheneRectExt
 where

crates/rnote-engine/src/fileformats/rnoteformat/mod.rs

@@ -54,7 +54,7 @@ struct RnotefileWrapper {
 pub type RnoteFile = RnoteFileMaj0Min6;
 
 impl RnoteFile {
-    pub const SEMVER: &str = "0.8.1";
+    pub const SEMVER: &str = "0.8.2";
 }
 
 impl FileFormatLoader for RnoteFile {

crates/rnote-engine/src/pens/tools.rs

@@ -449,7 +449,12 @@ impl PenBehaviour for Tools {
                                 &self.verticalspace_tool.strokes_below,
                                 na::vector![0.0, y_offset],
                             );
-
+                            engine_view.store.regenerate_rendering_in_viewport_threaded(
+                                engine_view.tasks_tx.clone(),
+                                false,
+                                engine_view.camera.viewport(),
+                                engine_view.camera.image_scale(),
+                            );
                             self.verticalspace_tool.pos_y = element.pos[1];
 
                             widget_flags.store_modified = true;

crates/rnote-ui/data/app.metainfo.xml.in.in

@@ -72,6 +72,16 @@
 
   <!-- The changelog should not be translated -->
   <releases>
+    <release version="0.8.2" date="2023-08-26">
+      <description>
+        <p>this release changes:</p>
+        <ul>
+          <li>fix: button presses not handled as pen events</li>
+          <li>fix: windows build</li>
+          <li>fix: bundled fonts not appearing in flatpak</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.8.1" date="2023-08-25">
       <description>
         <p>this release changes:</p>
@@ -80,11 +90,13 @@
           <li>feature: invert selection color brightness (thanks to @Kneemund)</li>
           <li>feature: optimize for printing export option (thanks to @Kneemund)</li>
           <li>feature: a few handwrite-y,typewriter and dyslexia fonts are now bundled with the application (check the README for a list of them)</li>
+          <li>feature: polyline shape and builder</li>
           <li>improvement: cli export enhancements (thanks to @LeSnake04)</li>
           <li>improvement: update outdated symbolic icons (thanks to @oscfdezdz)</li>
           <li>improvement: behaviour when opening files in new tab</li>
           <li>improvement: added close buttons to configuration popovers as a workaround for the Gtk4 stuck-popover bug</li>
           <li>improvement: default view offset when opening documents</li>
+          <li>enhancement: move view using arrow keys</li>
           <li>fix: orientation of some popovers when sidebar is on the left</li>
           <li>fix: restore vectorized images (Pdf pages, Svg) export</li>
           <li>fix: .rnote file imports that were created pre v0.5.9</li>

meson.build

@@ -1,7 +1,7 @@
 project(
     'rnote',
     ['rust', 'cpp'],
-    version: '0.8.1',
+    version: '0.8.2',
     meson_version: '>= 0.57',
 )
 # add a patch suffix for alpha or beta version, starting with a dash.