From c1591b07d183ee451ca4f349a39082b2ec0e1228 Mon Sep 17 00:00:00 2001 From: Stanislav Ilin Date: Thu, 4 Aug 2022 01:27:01 +0500 Subject: [PATCH 1/4] Recreate example --- example/.metadata | 39 ++++- example/linux/.gitignore | 1 + example/linux/CMakeLists.txt | 138 ++++++++++++++++++ example/linux/flutter/CMakeLists.txt | 88 +++++++++++ .../flutter/generated_plugin_registrant.cc | 11 ++ .../flutter/generated_plugin_registrant.h | 15 ++ example/linux/flutter/generated_plugins.cmake | 23 +++ example/linux/main.cc | 6 + example/linux/my_application.cc | 104 +++++++++++++ example/linux/my_application.h | 18 +++ lib/src/widgets/sidebarx_cell.dart | 80 +++++----- 11 files changed, 483 insertions(+), 40 deletions(-) create mode 100644 example/linux/.gitignore create mode 100644 example/linux/CMakeLists.txt create mode 100644 example/linux/flutter/CMakeLists.txt create mode 100644 example/linux/flutter/generated_plugin_registrant.cc create mode 100644 example/linux/flutter/generated_plugin_registrant.h create mode 100644 example/linux/flutter/generated_plugins.cmake create mode 100644 example/linux/main.cc create mode 100644 example/linux/my_application.cc create mode 100644 example/linux/my_application.h diff --git a/example/.metadata b/example/.metadata index 7539b43..95f73f5 100644 --- a/example/.metadata +++ b/example/.metadata @@ -1,10 +1,45 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 5f105a6ca7a5ac7b8bc9b241f4c2d86f4188cf5c + revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: android + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: ios + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: linux + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: macos + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: web + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: windows + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/linux/.gitignore b/example/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt new file mode 100644 index 0000000..74c66dd --- /dev/null +++ b/example/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "example") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.example") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# 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") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/example/linux/flutter/CMakeLists.txt b/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/example/linux/main.cc b/example/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/example/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/example/linux/my_application.cc b/example/linux/my_application.cc new file mode 100644 index 0000000..0ba8f43 --- /dev/null +++ b/example/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "example"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "example"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/example/linux/my_application.h b/example/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/example/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/lib/src/widgets/sidebarx_cell.dart b/lib/src/widgets/sidebarx_cell.dart index 0a43e43..a3c30eb 100644 --- a/lib/src/widgets/sidebarx_cell.dart +++ b/lib/src/widgets/sidebarx_cell.dart @@ -51,47 +51,51 @@ class _SidebarXCellState extends State { final textPadding = widget.selected ? theme.selectedItemTextPadding : theme.itemTextPadding; - return GestureDetector( - onTap: widget.onTap, - child: Container( - decoration: decoration, - padding: padding ?? const EdgeInsets.all(8), - margin: margin ?? const EdgeInsets.all(4), - child: Row( - mainAxisAlignment: widget.extended - ? MainAxisAlignment.start - : MainAxisAlignment.center, - children: [ - AnimatedBuilder( - animation: _animation, - builder: (context, _) { - final value = ((1 - _animation.value) * 6).toInt(); - if (value <= 0) { - return const SizedBox(); - } - return Spacer(flex: value); - }, - ), - if (widget.item.icon != null) - _Icon(item: widget.item, iconTheme: iconTheme) - else if (widget.item.iconWidget != null) - widget.item.iconWidget!, - Flexible( - flex: 6, - child: FadeTransition( - opacity: _animation, - child: Padding( - padding: textPadding ?? EdgeInsets.zero, - child: Text( - widget.item.label ?? '', - style: textStyle, - overflow: TextOverflow.fade, - maxLines: 1, + return MouseRegion( + onEnter: (e) => debugPrint(e.toString()), + onExit: (e) => debugPrint(e.toString()), + child: GestureDetector( + onTap: widget.onTap, + child: Container( + decoration: decoration, + padding: padding ?? const EdgeInsets.all(8), + margin: margin ?? const EdgeInsets.all(4), + child: Row( + mainAxisAlignment: widget.extended + ? MainAxisAlignment.start + : MainAxisAlignment.center, + children: [ + AnimatedBuilder( + animation: _animation, + builder: (context, _) { + final value = ((1 - _animation.value) * 6).toInt(); + if (value <= 0) { + return const SizedBox(); + } + return Spacer(flex: value); + }, + ), + if (widget.item.icon != null) + _Icon(item: widget.item, iconTheme: iconTheme) + else if (widget.item.iconWidget != null) + widget.item.iconWidget!, + Flexible( + flex: 6, + child: FadeTransition( + opacity: _animation, + child: Padding( + padding: textPadding ?? EdgeInsets.zero, + child: Text( + widget.item.label ?? '', + style: textStyle, + overflow: TextOverflow.fade, + maxLines: 1, + ), ), ), ), - ), - ], + ], + ), ), ), ); From ee715cc32312569e9ddc19eb13dd6f5294a1b6c6 Mon Sep 17 00:00:00 2001 From: Stanislav Ilin Date: Thu, 4 Aug 2022 01:43:55 +0500 Subject: [PATCH 2/4] Implement hoverColor --- example/lib/main.dart | 1 + lib/src/theme/sidebarx_theme.dart | 9 +++++++++ lib/src/widgets/sidebarx_cell.dart | 17 ++++++++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index f4ec394..7ef1f9a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -85,6 +85,7 @@ class ExampleSidebarX extends StatelessWidget { color: canvasColor, borderRadius: BorderRadius.circular(20), ), + hoverColor: Colors.white.withOpacity(0.5), textStyle: TextStyle(color: Colors.white.withOpacity(0.7)), selectedTextStyle: const TextStyle(color: Colors.white), itemTextPadding: const EdgeInsets.only(left: 30), diff --git a/lib/src/theme/sidebarx_theme.dart b/lib/src/theme/sidebarx_theme.dart index 0511c08..d4e8e92 100644 --- a/lib/src/theme/sidebarx_theme.dart +++ b/lib/src/theme/sidebarx_theme.dart @@ -19,6 +19,7 @@ class SidebarXTheme { this.selectedItemPadding, this.itemTextPadding, this.selectedItemTextPadding, + this.hoverColor, }); /// [SidebarX] width @@ -72,6 +73,10 @@ class SidebarXTheme { /// Selected item [SidebarXItem] text padding final EdgeInsets? selectedItemTextPadding; + /// Background color of [SidebarXItem] when the mouse + /// cursor hover over an item + final Color? hoverColor; + /// Method to get default flutter theme settings SidebarXTheme mergeFlutterTheme(BuildContext context) { final theme = Theme.of(context); @@ -95,6 +100,7 @@ class SidebarXTheme { selectedItemPadding: selectedItemPadding, itemTextPadding: itemTextPadding, selectedItemTextPadding: selectedItemTextPadding, + hoverColor: theme.hoverColor, ); return mergedTheme; } @@ -123,6 +129,7 @@ class SidebarXTheme { itemDecoration: itemDecoration ?? theme.itemDecoration, selectedItemDecoration: selectedItemDecoration ?? theme.selectedItemDecoration, + hoverColor: hoverColor ?? theme.hoverColor, ); } @@ -145,6 +152,7 @@ class SidebarXTheme { EdgeInsets? selectedItemPadding, EdgeInsets? itemTextPadding, EdgeInsets? selectedItemTextPadding, + Color? hoverColor, }) { return SidebarXTheme( width: width ?? this.width, @@ -166,6 +174,7 @@ class SidebarXTheme { itemTextPadding: itemTextPadding ?? this.itemTextPadding, selectedItemTextPadding: selectedItemTextPadding ?? this.selectedItemTextPadding, + hoverColor: hoverColor ?? this.hoverColor, ); } } diff --git a/lib/src/widgets/sidebarx_cell.dart b/lib/src/widgets/sidebarx_cell.dart index a3c30eb..d5faa6c 100644 --- a/lib/src/widgets/sidebarx_cell.dart +++ b/lib/src/widgets/sidebarx_cell.dart @@ -25,6 +25,7 @@ class SidebarXCell extends StatefulWidget { class _SidebarXCellState extends State { late Animation _animation; + var _hovered = false; @override void initState() { @@ -52,12 +53,14 @@ class _SidebarXCellState extends State { widget.selected ? theme.selectedItemTextPadding : theme.itemTextPadding; return MouseRegion( - onEnter: (e) => debugPrint(e.toString()), - onExit: (e) => debugPrint(e.toString()), + onEnter: (_) => _onEnteredCellZone(), + onExit: (_) => _onExitCellZone(), child: GestureDetector( onTap: widget.onTap, child: Container( - decoration: decoration, + decoration: decoration?.copyWith( + color: _hovered ? theme.hoverColor : null, + ), padding: padding ?? const EdgeInsets.all(8), margin: margin ?? const EdgeInsets.all(4), child: Row( @@ -100,6 +103,14 @@ class _SidebarXCellState extends State { ), ); } + + void _onEnteredCellZone() { + setState(() => _hovered = true); + } + + void _onExitCellZone() { + setState(() => _hovered = false); + } } class _Icon extends StatelessWidget { From e39217f076e8c058c544334a9d44e36db826e5aa Mon Sep 17 00:00:00 2001 From: Stanislav Ilin Date: Thu, 4 Aug 2022 01:48:34 +0500 Subject: [PATCH 3/4] Fix merge flutter theme --- example/lib/main.dart | 2 +- lib/src/theme/sidebarx_theme.dart | 2 +- lib/src/widgets/sidebarx_cell.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 7ef1f9a..8346f4a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -85,7 +85,7 @@ class ExampleSidebarX extends StatelessWidget { color: canvasColor, borderRadius: BorderRadius.circular(20), ), - hoverColor: Colors.white.withOpacity(0.5), + hoverColor: scaffoldBackgroundColor, textStyle: TextStyle(color: Colors.white.withOpacity(0.7)), selectedTextStyle: const TextStyle(color: Colors.white), itemTextPadding: const EdgeInsets.only(left: 30), diff --git a/lib/src/theme/sidebarx_theme.dart b/lib/src/theme/sidebarx_theme.dart index d4e8e92..3e66472 100644 --- a/lib/src/theme/sidebarx_theme.dart +++ b/lib/src/theme/sidebarx_theme.dart @@ -100,7 +100,7 @@ class SidebarXTheme { selectedItemPadding: selectedItemPadding, itemTextPadding: itemTextPadding, selectedItemTextPadding: selectedItemTextPadding, - hoverColor: theme.hoverColor, + hoverColor: hoverColor ?? theme.hoverColor, ); return mergedTheme; } diff --git a/lib/src/widgets/sidebarx_cell.dart b/lib/src/widgets/sidebarx_cell.dart index d5faa6c..533408d 100644 --- a/lib/src/widgets/sidebarx_cell.dart +++ b/lib/src/widgets/sidebarx_cell.dart @@ -59,7 +59,7 @@ class _SidebarXCellState extends State { onTap: widget.onTap, child: Container( decoration: decoration?.copyWith( - color: _hovered ? theme.hoverColor : null, + color: _hovered && !widget.selected ? theme.hoverColor : null, ), padding: padding ?? const EdgeInsets.all(8), margin: margin ?? const EdgeInsets.all(4), From 647600bf964e663f2e4a7fbf46804e0b7ae662de Mon Sep 17 00:00:00 2001 From: Stanislav Ilin Date: Thu, 4 Aug 2022 01:57:59 +0500 Subject: [PATCH 4/4] Add SystemMouseCursors.click for cell widget --- lib/src/widgets/sidebarx_cell.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/widgets/sidebarx_cell.dart b/lib/src/widgets/sidebarx_cell.dart index 533408d..63128c3 100644 --- a/lib/src/widgets/sidebarx_cell.dart +++ b/lib/src/widgets/sidebarx_cell.dart @@ -55,6 +55,7 @@ class _SidebarXCellState extends State { return MouseRegion( onEnter: (_) => _onEnteredCellZone(), onExit: (_) => _onExitCellZone(), + cursor: SystemMouseCursors.click, child: GestureDetector( onTap: widget.onTap, child: Container(