Diffusion Krita ee43696495cc

Merge branch 'ani/layerfilter' into 'master'
ee43696495cc
Actions

Authored by emmetoneill on Jun 16 2020, 2:36 AM.

Description

Merge branch 'ani/layerfilter' into 'master'

Animation: KisLayerFilterWidget & Text-based Filtering

See merge request graphics/krita!292

Details

Committed

emmetoneill

Jun 16 2020, 2:36 AM

Parents

R37:14f662fb7032: The Most Important Commit In History.
R37:4da7de9143e2: Color Label Fixes

Branches

Unknown

Tags

Unknown

This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.

emmetoneill committed R37:ee43696495cc: Merge branch 'ani/layerfilter' into 'master' (authored by emmetoneill).Jun 16 2020, 2:36 AM

Merged Changes

Commit	Author	Details	Committed
4da7de9143e2	eoinoneill/emmetoneill	Color Label Fixes	Jun 12 2020
bd3ed8b5c654	eoinoneill	LayerColorFilter - fix compilation for Qt 5.12.8	Jun 10 2020
912ea8e3a393	eoinoneill	Removed folder text exception to keep behavior consistent between label and…	Jun 9 2020
93513129af24	eoinoneill	Reworked color label button visualization to work on more themes.	Jun 9 2020
dd8540429504	eoinoneill	Made icon for text-enabled filtering.	Jun 9 2020
96b7841ad7db	eoinoneill	Fix icon alignment bug.	Jun 9 2020
a9f2b9865171	eoinoneill	Fix double-click behavior of Filter Widget.	Jun 9 2020
e6980eaa65a8	eoinoneill	Added mouse click filter on menus holding KisLabelFilter/Selector Widgets.	Jun 9 2020
f760be2df17f	eoinoneill	Changed filter widget size.	Jun 9 2020
2183d7776ef8	eoinoneill	Fix visuals of colored pie.	Jun 9 2020
b86360add526	eoinoneill	Working FilterWidget Pie Vis.	Jun 9 2020
1200da9822f0	eoinoneill	ColorLabelFilter: Fix selection of multiple layers + label assignment.	Jun 9 2020
7d5844e3ea80	eoinoneill	Fixup - color_layer_filter_widget corrections.	Jun 9 2020
8099df726da2	eoinoneill	Added KisColorLabelButton to Onion Skins Docker.	Jun 9 2020
67d8866517f6	eoinoneill	KisColorFilter -- Propagated widget style change to Label Selector.	Jun 9 2020
1e9b8cf8a910	eoinoneill	Fix Resizing Widget Issues	Jun 9 2020
1203bd762534	eoinoneill	Visual Alterations To KisColorLabelButton	Jun 9 2020
df52f3f35a81	eoinoneill	Removed Boost::optional `has_value` call.	Jun 9 2020
688720fc7556	eoinoneill	Fix QMenu resizing of FilterWidget	Jun 9 2020
e82e914105d2	eoinoneill	Minor refactor, cleanup of button group behavior and interface issues.	Jun 9 2020
0f2f661965d0	eoinoneill	Clean Up Code and Fixed Redundancies.	Jun 9 2020
9a1d86e17e9d	eoinoneill	Text Filter Now Accounts for Direct Parent Name	Jun 9 2020
8744441111ab	eoinoneill	Added ability to isolate color labels.	Jun 9 2020
c0152ca7f2a5	eoinoneill	Fix Leftward Mouse-Drag Filter Button Not Toggling Properly.	Jun 9 2020
f9504173c31c	eoinoneill	Reset Filter Button Added and Tooltip for Color Label Buttons	Jun 9 2020
a2cae557646c	eoinoneill	Layer Filtering: Fixed bugs when changing active layer.	Jun 9 2020
3aac0bdc9852	eoinoneill	Layer Filtering: Fixed X icon scaling issues.	Jun 9 2020
e991b1ce8585	emmetoneill/eoinoneill	Added new KisLayerFilterWidget.	Jun 9 2020
94346eeb247b	emmetoneill/eoinoneill	Layer color label recursion no overwrite.	Jun 9 2020

Changes (18)

				Path	Packages
	M			libs/ui/CMakeLists.txt
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_filter_proxy_model.h
	M			libs/ui/widgets/kis_color_filter_combo.cpp
	M			libs/ui/widgets/kis_color_filter_combo.h
	A			libs/ui/widgets/kis_color_label_button.cpp
	A			libs/ui/widgets/kis_color_label_button.h
	M			libs/ui/widgets/kis_color_label_selector_widget.cpp
	M			libs/ui/widgets/kis_color_label_selector_widget.h
	A			libs/ui/widgets/kis_layer_filter_widget.cpp
	A			libs/ui/widgets/kis_layer_filter_widget.h
	M			plugins/dockers/animation/onion_skins_docker.cpp
	M			plugins/dockers/animation/onion_skins_docker.h
	M			plugins/dockers/animation/onion_skins_docker.ui
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/dockers/layerdocker/LayerBox.h
	M			plugins/dockers/layerdocker/WdgLayerBox.ui