mirror of
https://github.com/fltk/fltk.git
synced 2026-03-23 15:35:11 +08:00
Fluid would add pasted widgets as the last child of the current group, even if they were cut at the beginning of the group. This patch adds a 'startegy' to adding widgets to allow merging closer to the 'current' widget. Also added d'n'd for the widget bin and some other UI improvements. STR 3442: some preparation, variable renaming STR 3442: unifying functions to add widgets. Adding widgets interactively is merged into one function, making undo/redo work as expected and removing unexpected differences between adding by menu or bin. STR 3442: adding drag'n'drop for windows from bin. Just drag the window symbol out of the tree and drop it anywhere on the desktop. Visual representation of dragged Window. STR 3442: insert individual nodes after 'current' STR 3442: adding new widget at expected positions. The widget bin can finally do drag'n'drop. Widgets appear in the tree close to the last selection. Duplicating now ads right below. Cut and paste inserts after last selection. Fluid: replaced #define with strict enum type.
155 lines
3.9 KiB
CMake
155 lines
3.9 KiB
CMake
#
|
|
# CMakeLists.txt to build fluid for the FLTK project using CMake (www.cmake.org)
|
|
#
|
|
# Copyright 1998-2021 by Bill Spitzak and others.
|
|
#
|
|
# This library is free software. Distribution and use rights are outlined in
|
|
# the file "COPYING" which should have been included with this file. If this
|
|
# file is missing or damaged, see the license at:
|
|
#
|
|
# https://www.fltk.org/COPYING.php
|
|
#
|
|
# Please see the following page on how to report bugs and issues:
|
|
#
|
|
# https://www.fltk.org/bugs.php
|
|
#
|
|
|
|
set (CPPFILES
|
|
CodeEditor.cxx
|
|
StyleParse.cxx
|
|
Fl_Function_Type.cxx
|
|
Fl_Group_Type.cxx
|
|
Fl_Menu_Type.cxx
|
|
Fl_Type.cxx
|
|
Fl_Widget_Type.cxx
|
|
Fl_Window_Type.cxx
|
|
Fluid_Image.cxx
|
|
Shortcut_Button.cxx
|
|
about_panel.cxx
|
|
align_widget.cxx
|
|
alignment_panel.cxx
|
|
code.cxx
|
|
factory.cxx
|
|
file.cxx
|
|
fluid.cxx
|
|
function_panel.cxx
|
|
pixmaps.cxx
|
|
shell_command.cxx
|
|
template_panel.cxx
|
|
undo.cxx
|
|
widget_browser.cxx
|
|
widget_panel.cxx
|
|
)
|
|
|
|
# also list header files in Apple's Xcode IDE
|
|
|
|
set (HEADERFILES
|
|
CodeEditor.h
|
|
Fl_Function_Type.h
|
|
Fl_Group_Type.h
|
|
Fl_Menu_Type.h
|
|
Fl_Type.h
|
|
Fl_Widget_Type.h
|
|
Fl_Window_Type.h
|
|
Fluid_Image.h
|
|
Shortcut_Button.h
|
|
StyleParse.h
|
|
about_panel.h
|
|
align_widget.h
|
|
alignment_panel.h
|
|
code.h
|
|
comments.h
|
|
factory.h
|
|
file.h
|
|
fluid.h
|
|
function_panel.h
|
|
print_panel.h
|
|
pixmaps.h
|
|
shell_command.h
|
|
template_panel.h
|
|
undo.h
|
|
widget_browser.h
|
|
widget_panel.h
|
|
)
|
|
|
|
# ExternalCodeEditor: platform specific files
|
|
|
|
if (WIN32)
|
|
list (APPEND CPPFILES ExternalCodeEditor_WIN32.cxx)
|
|
list (APPEND HEADERFILES ExternalCodeEditor_WIN32.h)
|
|
else ()
|
|
list (APPEND CPPFILES ExternalCodeEditor_UNIX.cxx)
|
|
list (APPEND HEADERFILES ExternalCodeEditor_UNIX.h)
|
|
endif (WIN32)
|
|
|
|
source_group("Header Files" FILES ${HEADERFILES})
|
|
|
|
if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
|
set (ICON_NAME fluid.icns)
|
|
set (ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}")
|
|
add_executable (fluid MACOSX_BUNDLE ${CPPFILES} ${HEADERFILES} ${ICON_PATH})
|
|
|
|
# create macOS bundle wrapper script
|
|
|
|
set (WRAPPER "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/fluid")
|
|
add_custom_command (
|
|
TARGET fluid POST_BUILD
|
|
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../CMake/macOS-bundle-wrapper.in ${WRAPPER}
|
|
COMMAND chmod u+x,g+x,o+x ${WRAPPER}
|
|
BYPRODUCTS ${WRAPPER}
|
|
# COMMENT "Creating macOS bundle wrapper script ${WRAPPER}"
|
|
VERBATIM
|
|
)
|
|
unset (WRAPPER)
|
|
|
|
else ()
|
|
add_executable (fluid WIN32 ${CPPFILES} ${HEADERFILES})
|
|
endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
|
|
|
target_link_libraries (fluid fltk fltk_images fltk_forms)
|
|
if (FLTK_HAVE_CAIRO)
|
|
fl_target_link_directories (fluid PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
|
|
endif (FLTK_HAVE_CAIRO)
|
|
|
|
if (USE_GDIPLUS) # can only be true on Windows
|
|
target_link_libraries (fluid gdiplus)
|
|
endif (USE_GDIPLUS)
|
|
|
|
# install fluid
|
|
|
|
if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
|
# create bundle
|
|
set_target_properties (fluid PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/fluid.plist")
|
|
set_target_properties (fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
|
|
set_target_properties (fluid PROPERTIES RESOURCE ${ICON_PATH})
|
|
# install
|
|
install (TARGETS fluid DESTINATION ${FLTK_BINDIR})
|
|
else()
|
|
install (TARGETS fluid
|
|
EXPORT FLTK-Targets
|
|
RUNTIME DESTINATION ${FLTK_BINDIR}
|
|
LIBRARY DESTINATION ${FLTK_LIBDIR}
|
|
ARCHIVE DESTINATION ${FLTK_LIBDIR}
|
|
)
|
|
endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
|
|
|
# install desktop files
|
|
|
|
if (UNIX)
|
|
install (FILES fluid.desktop
|
|
DESTINATION ${FLTK_DATADIR}/applications
|
|
)
|
|
# Install mime-type file (x-fluid.desktop method is deprecated)
|
|
install (FILES fluid.xml
|
|
DESTINATION ${FLTK_DATADIR}/mime/packages
|
|
)
|
|
|
|
# Install desktop icons
|
|
foreach (icon 32 48 64 128)
|
|
install (FILES icons/fluid-${icon}.png
|
|
DESTINATION ${FLTK_DATADIR}/icons/hicolor/${icon}x${icon}/apps
|
|
RENAME fluid.png
|
|
)
|
|
endforeach()
|
|
endif (UNIX)
|