Merge branch 'ani/layerfilter' into 'master'
6f3ab579a809
Actions

Authored by emmetoneill on Jun 23 2020, 3:57 AM.

Description

Merge branch 'ani/layerfilter' into 'master'

Animation: KisLayerFilterWidget & Text-based Filtering

See merge request graphics/krita!292

Committed

emmetoneill

Jun 23 2020, 3:57 AM

Parents

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/292/merge

Commit	Author	Details	Committed
461f5aa0524e	eoinoneill	LayerFilterWidget: Removed parent-inclusion to text filter to keep behavior…	Jun 23 2020
c39731457e6b	eoinoneill	LayerFilterWidget: Reworked color label button visualization to work on more…	Jun 23 2020
e13694dcbccb	eoinoneill	LayerFilterWidget: Fix icon alignment issues on KDE system Made icon for text…	Jun 23 2020
e9fa7916446b	eoinoneill	LayerFilterWidget: Added mouse click filter on menus holding…	Jun 23 2020
80a25bc82a35	eoinoneill	LayerFilterWidget: Reimplement color-pie visualization for when filters are…	Jun 23 2020
83b97c8b77c4	eoinoneill	LayerFilterWidget: Added KisColorLabelButtons to Onion Skins Docker.	Jun 23 2020
884a35cca36d	eoinoneill	LayerFilterWidget -- Updated label selector to match new layer filter widget.	Jun 23 2020
8afb4fccf90f	eoinoneill	LayerFilterWidget: Visual Alterations To KisColorLabelButton	Jun 23 2020
e81381c03e47	eoinoneill	Text Filter Now Accounts for Direct Parent Name	Jun 23 2020
48c39f3424d1	eoinoneill	Added ability to isolate color labels.	Jun 23 2020
8cfe3c70fddf	emmetoneill/eoinoneill	Added new KisLayerFilterWidget.	Jun 23 2020
a4a758b5f396	emmetoneill/eoinoneill	Layer color label recursion no overwrite.	Jun 23 2020

				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