Merge branch 'rempt/intel-3'
348d5576db54
Actions

Authored by rempt on Aug 12 2019, 10:56 AM.

Description

Merge branch 'rempt/intel-3'

Committed

rempt

Aug 12 2019, 10:56 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
cf145b393c9c	rempt	Fix detaching canvas	Aug 12 2019
56fc906acb87	rempt	Fix documentation	Aug 12 2019
1ae68c70352b	rempt	Fix crash	Aug 12 2019
71ff0dcd03fc	jounip	Merge branch 'master' into rempt/intel-3	Aug 11 2019
203f54c45008	jounip	Merge remote-tracking branch 'origin/master' into rempt/intel-3	Apr 11 2018
8e480a81fc40	jounip	Remove placeholder widget used in detached canvas mode	Apr 11 2018
57ed30da0bd7	jounip	Return canvas to main window if detached canvas window is closed	Apr 10 2018
5644a8dedc8e	jounip	Restore detached canvas window geometry to correct window	Apr 10 2018
3b4cd767ea0b	jounip	Save geometry of detached canvas window to window layouts and sessions	Apr 6 2018
8673d24eb0da	jounip	Add option to detach canvas area to a separate window	Apr 5 2018
01e3e1bf89de	jounip	Refactor how views access their main window	Apr 5 2018

				Path	Packages
	M			krita/krita4.xmlgui
	M			krita/kritamenu.action
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoCanvasControllerWidget.h
	M			libs/flake/KoCanvasControllerWidget_p.h
	M			libs/libqml/KisSketchView.cpp
	M			libs/ui/CMakeLists.txt
	A			libs/ui/KisCanvasWindow.cpp
	P			libs/ui/KisCanvasWindow.h Copied from libs/ui/KisChangeCloneLayersCommand.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMainWindow.h
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisPart.h
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	M			libs/ui/KisWindowLayoutResource.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/canvas/kis_canvas_controller.h
	M			libs/ui/tests/kis_action_manager_test.cpp
	M			libs/ui/tests/kis_derived_resources_test.cpp
	M			libs/ui/tests/kis_zoom_and_pan_test.cpp
	M			libs/widgets/tests/zoomcontroller_test.cpp
	M			sdk/tests/ui_manager_test.h