diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart index b3afdac56572..0f5a30a9bdb0 100644 --- a/app/lib/cubits/current_index.dart +++ b/app/lib/cubits/current_index.dart @@ -613,7 +613,7 @@ class CurrentIndexCubit extends Cubit { document, page, info, - transform: transform, + transform: renderTransform, states: state.allRendererStates, resolution: resolution, cameraViewport: cameraViewport.unbake( @@ -627,7 +627,7 @@ class CurrentIndexCubit extends Cubit { document, page, info, - transform: transform, + transform: renderTransform, states: state.allRendererStates, resolution: resolution, cameraViewport: cameraViewport.unbake( diff --git a/app/lib/cubits/settings.dart b/app/lib/cubits/settings.dart index 1d809d56b0b8..3145e3d5391c 100644 --- a/app/lib/cubits/settings.dart +++ b/app/lib/cubits/settings.dart @@ -340,7 +340,10 @@ class ButterflySettings with _$ButterflySettings, LeapSettings { ? OptionsPanelPosition.values .byName(prefs.getString('options_panel_position')!) : OptionsPanelPosition.top, - renderResolution: prefs.containsKey('render_resolution') ? RenderResolution.values.byName(prefs.getString('render_resolution')!) : RenderResolution.normal, + renderResolution: prefs.containsKey('render_resolution') + ? RenderResolution.values + .byName(prefs.getString('render_resolution')!) + : RenderResolution.normal, ); } diff --git a/app/lib/selections/tools/area.dart b/app/lib/selections/tools/area.dart index 769204b5ab8d..b956868bd2c1 100644 --- a/app/lib/selections/tools/area.dart +++ b/app/lib/selections/tools/area.dart @@ -36,7 +36,6 @@ class AreaToolSelection extends ToolSelection { Expanded( child: Text( AppLocalizations.of(context).aspectRatio, - textAlign: TextAlign.center, ), ), MenuAnchor( diff --git a/app/lib/settings/behaviors.dart b/app/lib/settings/behaviors.dart index 1fd8eb78d331..b19a7a49ac5b 100644 --- a/app/lib/settings/behaviors.dart +++ b/app/lib/settings/behaviors.dart @@ -18,9 +18,11 @@ class BehaviorsSettingsPage extends StatelessWidget { StartupBehavior.openNewNote => AppLocalizations.of(context).newNote, }; - String _getRenderResolutionName(BuildContext context, RenderResolution value) => + String _getRenderResolutionName( + BuildContext context, RenderResolution value) => switch (value) { - RenderResolution.performance => AppLocalizations.of(context).performance, + RenderResolution.performance => + AppLocalizations.of(context).performance, RenderResolution.normal => AppLocalizations.of(context).normal, RenderResolution.high => AppLocalizations.of(context).high, }; @@ -30,7 +32,8 @@ class BehaviorsSettingsPage extends StatelessWidget { switch (value) { RenderResolution.performance => AppLocalizations.of(context).performanceDescription, - RenderResolution.normal => AppLocalizations.of(context).normalDescription, + RenderResolution.normal => + AppLocalizations.of(context).normalDescription, RenderResolution.high => AppLocalizations.of(context).highDescription, }; @@ -84,9 +87,10 @@ class BehaviorsSettingsPage extends StatelessWidget { leading: const Icon(PhosphorIconsLight.arrowFatLineUp), ), ListTile( - title: Text(AppLocalizations.of(context).renderResolution), - subtitle: Text( - _getRenderResolutionName(context, state.renderResolution)), + title: + Text(AppLocalizations.of(context).renderResolution), + subtitle: Text(_getRenderResolutionName( + context, state.renderResolution)), onTap: () => _openRenderResolutionModal(context), leading: const Icon(PhosphorIconsLight.sparkle), ), @@ -181,7 +185,8 @@ class BehaviorsSettingsPage extends StatelessWidget { showLeapBottomSheet( context: context, - titleBuilder: (context) => Text(AppLocalizations.of(context).renderResolution), + titleBuilder: (context) => + Text(AppLocalizations.of(context).renderResolution), childrenBuilder: (context) { void changeResolution(RenderResolution resolution) { cubit.changeRenderResolution(resolution); diff --git a/metadata/en-US/changelogs/124.txt b/metadata/en-US/changelogs/124.txt index 368cf29650e5..99eec39355e2 100644 --- a/metadata/en-US/changelogs/124.txt +++ b/metadata/en-US/changelogs/124.txt @@ -5,6 +5,7 @@ * Change create template button to save icon * Improve thumbnail display to have rounded corners * Add color wheel to color picker +* Add render resolution to improve moving on canvas * Improve responsiveness of exact slider * Change zoom dependent to false by default * Fix export on web @@ -15,6 +16,7 @@ * Fix temporary import handler does not get removed after clicking * Fix asset hash not correctly working with filenames * Fix duplicated asset importing +* Fix aspect ratio label in area tool selection view * Show git hash instead of version in web version * Upgrade to flutter 3.27