diff --git a/.metadata b/.metadata index 3fd83c7e1..3714e33d8 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "ead455963c12b453cdb2358cad34969c76daf180" + revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2" channel: "stable" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: ead455963c12b453cdb2358cad34969c76daf180 - base_revision: ead455963c12b453cdb2358cad34969c76daf180 + create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 - platform: windows - create_revision: ead455963c12b453cdb2358cad34969c76daf180 - base_revision: ead455963c12b453cdb2358cad34969c76daf180 + create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 + base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2 # User provided section diff --git a/lib/utils/super_editor/toolbar.dart b/lib/utils/super_editor/toolbar.dart index de50da096..4c808efd5 100644 --- a/lib/utils/super_editor/toolbar.dart +++ b/lib/utils/super_editor/toolbar.dart @@ -1,6 +1,7 @@ import 'dart:math'; //import 'package:example/logging.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; //import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:follow_the_leader/follow_the_leader.dart'; @@ -543,6 +544,7 @@ class _EditorToolbarState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ + /* // Only allow the user to select a new type of text node if // the currently selected node can be converted. if (_isConvertibleNode()) ...[ @@ -573,6 +575,7 @@ class _EditorToolbarState extends State { ), _buildVerticalDivider(), ], + */ Center( child: IconButton( onPressed: _toggleBold, @@ -600,19 +603,21 @@ class _EditorToolbarState extends State { tooltip: 'Strikethrough', ), ), - Center( - child: IconButton( - onPressed: - _areMultipleLinksSelected() ? null : _onLinkPressed, - icon: const Icon(Icons.link), - color: _isSingleLinkSelected() - ? const Color(0xFF007AFF) - : IconTheme.of(context).color, - splashRadius: 16, - //tooltip: AppLocalizations.of(context)!.labelLink, - tooltip: 'Link', + if (kIsWeb) + Center( + child: IconButton( + onPressed: + _areMultipleLinksSelected() ? null : _onLinkPressed, + icon: const Icon(Icons.link), + color: _isSingleLinkSelected() + ? const Color(0xFF007AFF) + : IconTheme.of(context).color, + splashRadius: 16, + //tooltip: AppLocalizations.of(context)!.labelLink, + tooltip: 'Link', + ), ), - ), + /* // Only display alignment controls if the currently selected text // node respects alignment. List items, for example, do not. if (_isTextAlignable()) ...[ @@ -658,6 +663,7 @@ class _EditorToolbarState extends State { tooltip: 'More Options', ), ), + */ ], ), ), diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 83b8e72a2..f175ddfd6 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -89,6 +89,12 @@ if(PLUGIN_BUNDLED_LIBRARIES) COMPONENT Runtime) endif() +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + # Fully re-copy the assets directory on each build to avoid having stale files # from a previous install. set(FLUTTER_ASSET_DIR_NAME "flutter_assets")