Diffusion Krita 7cd9f0b1afa1

Merge branch 'kinetic-COMPLETE'
7cd9f0b1afa1
Actions

Authored by eoinoneill on Oct 10 2018, 5:22 PM.

Description

Merge branch 'kinetic-COMPLETE'

Details

Committed

eoinoneill

Oct 10 2018, 5:22 PM

Parents

R37:49da90708aa5: Global Kinetic Scrolling Added
R37:046ce7128a7e: Fix fractional display scale factor

Branches

Unknown

Tags

Unknown

eoinoneill committed R37:7cd9f0b1afa1: Merge branch 'kinetic-COMPLETE' (authored by eoinoneill).Oct 10 2018, 5:22 PM

Merged Changes

	Commit			Author	Details	Committed
	49da90708aa5			eoinoneill	Global Kinetic Scrolling Added	Oct 10 2018

Changes (55)

				Path	Packages
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisNodeView.cpp
	M			libs/ui/KisNodeView.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/input/config/kis_input_configuration_page.cpp
	M			libs/ui/input/config/kis_input_configuration_page.h
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/widgets/kis_categorized_list_view.cpp
	M			libs/ui/widgets/kis_categorized_list_view.h
	M			libs/ui/widgets/kis_filter_selector_widget.cc
	M			libs/ui/widgets/kis_filter_selector_widget.h
	M			libs/ui/widgets/kis_gradient_chooser.cc
	M			libs/ui/widgets/kis_pattern_chooser.cc
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_preset_chooser.h
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/widgets/KoResourceItemChooser.cpp
	M			libs/widgets/KoResourceItemChooser.h
	M			libs/widgets/KoResourceItemView.cpp
	M			libs/widgets/KoResourceItemView.h
	M			libs/widgets/KoTableView.cpp
	M			libs/widgets/KoTableView.h
	M			libs/widgets/KoToolBoxScrollArea_p.h
	M			libs/widgets/KoToolDocker.cpp
	M			libs/widgets/KoToolDocker.h
	M			libs/widgets/kis_palette_view.cpp
	M			libs/widgets/kis_palette_view.h
	M			libs/widgetutils/CMakeLists.txt
	A			libs/widgetutils/KisKineticScroller.cpp
	P			libs/widgetutils/KisKineticScroller.h Copied from libs/flake/KoGradientHelper.h
	M			libs/widgetutils/xmlgui/KisShortcutsEditor.h
	M			libs/widgetutils/xmlgui/KisShortcutsEditor_p.cpp
	M			libs/widgetutils/xmlgui/KisShortcutsEditor_p.h
	M			plugins/dockers/animation/kis_animation_curve_docker.cpp
	M			plugins/dockers/animation/kis_animation_curve_docker.h
	M			plugins/dockers/animation/kis_animation_curves_view.cpp
	M			plugins/dockers/animation/kis_animation_curves_view.h
	M			plugins/dockers/animation/kis_time_based_item_model.h
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/dockers/channeldocker/channeldocker_dock.cpp
	M			plugins/dockers/channeldocker/channeldocker_dock.h
	M			plugins/dockers/compositiondocker/compositiondocker_dock.cpp
	M			plugins/dockers/compositiondocker/compositiondocker_dock.h
	M			plugins/dockers/historydocker/KisUndoView.cpp
	M			plugins/dockers/historydocker/KisUndoView.h
	M			plugins/dockers/presethistory/presethistory_dock.cpp
	M			plugins/dockers/presethistory/presethistory_dock.h
	M			plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.cpp
	M			plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.h
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.h