Commit graph

2261 commits

Author SHA1 Message Date
Martin Gräßlin
612709d9d3 [aurorae] Use QWindow based API instead of wrapping in a QWidget
Works quite decently already, but some things do not work properly yet,
e.g. doubleclick on decoration is not noticed.
2013-11-14 09:41:51 +01:00
Martin Gräßlin
98549449d6 [aurorae] Implement new render method in Aurorae
Improves the situation a little bit: schedules updates without
rendering to the QWidget, but still fbo -> QImage in each frame.
2013-11-14 09:41:50 +01:00
Martin Gräßlin
f8acfbf2a0 [aurorae] Connect PlastikButton to options::colorChanged signal
Fixes incorrect button color. DecorationOptions and PlastikButton are
both connected to decoration.active and the button gets invoked first,
thus the titleBarColor is still for the previous state. This was fun!
2013-11-14 09:41:50 +01:00
Martin Gräßlin
dd6598c1ff [aurorae] Hack to get Aurorae work with compositing
This is a temporary solution! A proper solution needs changes in
libkdecoration and paint redirector.

The hack redirects the rendering into an FBO. After each rendering we
get a QImage from the FBO and store that in a buffer. As we unfortunately
do not know what changed, we schedule a complete update on the deco's
widget. Once we get the paint event we just render the buffer on the
widget. And thus we have copied the content to a place where it
integrates with the paint redirector.

As already written, this is a horrible hack and I'm not proud about it.
There are just too many copies involved.

So how to improve?
* deco should be able to just provide a QImage to the PaintRedirector
  without the paint to the QWidget.
* only do the FBO -> QImage step if it is needed by the compositor, that
  is compress the events
* for OpenGL compositing it would be totally awesome if we could just
  make the contexts sharing so that we can just reuse the texture from
  the FBO directly.
2013-11-14 09:41:50 +01:00
Martin Gräßlin
93c2eea528 [aurorae] Use QtQuick2 instead of QtDeclarative
Major transition to render using QtQuick 2. This means the actual
rendering needs a QQuickWindow which we embed into a QWidget container.
Not an optimal solution, deco API should offer to operate on QWindow.

For non-composited the decoration gets rendered but for composited
rendering the paint redirector is broken. There are no paint events on
the main QWidget to intercept and thus the redirection doesn't work.
2013-11-14 09:41:50 +01:00
Martin Gräßlin
d1afcc7cb2 [aurorae] Whether animations are supported only depends on compositing
Test for raster graphics system doesn't make any sense in QtQuick2 world.
2013-11-14 09:41:50 +01:00
Martin Gräßlin
736a0c5611 [aurorae] Fix locating of theme configuration file 2013-11-14 09:41:50 +01:00
Aurélien Gâteau
47c12347ea Fix clean build
libkdecorations is part of kde-workspace so calling find_library() cannot
work on a clean build since it has not been installed yet. CMake knows
about it anyway since its part of kde-workspace, so it can use it without
finding it.

CCMAIL: hugo@oxygen-icons.org
2013-11-13 10:11:40 +01:00
Hugo Pereira Da Costa
caa660fdb8 use add_library instead of kde4_add_plugin
reduced KF5 dependencies.
2013-11-13 17:32:14 +01:00
Hugo Pereira Da Costa
242dcb87d3 removed lib from config plugin libraries
consistently added MODULE to relevant add_library calls.
2013-11-13 17:32:14 +01:00
Hugo Pereira Da Costa
eaa1930975 use Helper::ScopedPointer instead of QScopedPointer for simplification. 2013-11-12 00:54:26 +01:00
Hugo Pereira Da Costa
33363908c1 ensures xcb_reply_t deallocation using QScopedPointer 2013-11-12 00:54:25 +01:00
Hugo Pereira Da Costa
bdd1cfd7b8 QLatin1String -> QStringLiteral 2013-11-12 00:52:29 +01:00
Bhushan Shah
935851a2b5 kDebug -> qDebug in kwin 2013-11-01 17:00:41 +05:30
Hugo Pereira Da Costa
f9b4fed604 removed ununsed (and obsolete) includes. 2013-10-24 11:57:30 +02:00
Hugo Pereira Da Costa
b35a760b66 Port oxygen decoration from X11 to XCB
- use xcb for shadow atom
- use xcb to handle sizegrip map/raised
- removed dependency upon QX11Info and QtX11Extras.
- moved window detection to xcb
2013-10-24 11:41:45 +02:00
Hugo Pereira Da Costa
b2aad6a693 fixed layout of oxygen decoration config in oxygen-settings 2013-10-21 17:00:04 +02:00
Hugo Pereira Da Costa
ce0d2af529 re-added checkbox to combobox signal-slot connection. 2013-10-21 15:56:25 +02:00
Thomas Lübking
9bf14c2653 Merge branch 'KDE/4.11'
Conflicts:
	kwin/clients/aurorae/src/aurorae.cpp
2013-10-20 19:40:48 +02:00
Thomas Lübking
3692549170 fix deco config updates
- B2 linked to the wrong slot (instead of changed signal)
- border size change was not written (for B2, Laptop etc)
- Aurorae didn't recreate decos when required

BUG: 325946
FIXED-IN: 4.11.3
REVIEW: 113229
2013-10-20 19:37:14 +02:00
Raphael Kubo da Costa
54b08b9d9e Merge branch 'KDE/4.11'
* KDE/4.11:
  Remove assertion in KDecorationUnstable's constructor.
  SVN_SILENT made messages (.desktop file)
  Cursor Theme KCM: Show correct resize cursor in preview for themes without a file called "size_fdiag"
  Fixed missing signal/slot connection:
  Fix zoom effect cursor position on initial zoom in.
  SVN_SILENT made messages (.desktop file)
  Don't show borders for a maximized Laptop client
  Always use PositionCenter for maximized windows
  Fix click on trash plasmoid when on desktop and widgets are unlocked

Conflicts:
	kwin/clients/aurorae/src/aurorae.cpp
	kwin/libkdecorations/kdecoration.cpp
	plasma/desktop/applets/trash/trash.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-10-20 17:42:39 +03:00
Hugo Pereira Da Costa
2b149bc18b kde4_add_kcfg_files -> kconfig_add_kcfg_files 2013-10-18 13:55:53 +02:00
Sebastian Kügler
b68867463e Change KF5::plasma to KF5::Plasma
Library name has changed in plasma-framework to bring it in line with
KF5:CamelCasing naming.
2013-10-16 01:36:56 +02:00
Sebastian Kügler
3ec1b9fd6a link against Plasma, it's using framesvg 2013-10-11 01:10:11 +02:00
Sebastian Kügler
b8c55eddc5 Try to make jenkins happy
The logic to use $INCLUDE_INSTALL_DIR/KDE doesn't work there, since the
plasma includes land in a different path on the jenkins setup. Let's see
if this fixes it.
2013-10-11 01:00:31 +02:00
Hugo Pereira Da Costa
1e735ba765 fixed first tab shown in ui 2013-10-09 00:49:54 +02:00
Martin Gräßlin
4a8e52ee4c Don't show borders for a maximized Laptop client
Maximized windows should not have borders.

REVIEW: 113047
2013-10-08 10:15:08 +02:00
Martin Gräßlin
0ec8646d78 Always use PositionCenter for maximized windows
It was showing the resize cursor at the top title edge which is not
wanted in maximized mode.
2013-10-08 10:15:08 +02:00
Christoph Feck
8b1b0fded5 Merge remote-tracking branch 'origin/KDE/4.11' 2013-10-04 14:49:01 +02:00
Montel Laurent
11e99c7b46 Pedantic 2013-10-03 21:51:17 +02:00
Martin Gräßlin
8055cde910 [aurorae] Plastik theme transits to QtQuick 2 2013-10-01 14:05:58 +02:00
Martin Gräßlin
fbe5a497b4 [aurorae] Fix locating the config file of aurorae themes
Installed to GenericDataLocation and not DataLocation.
2013-10-01 14:05:58 +02:00
Martin Gräßlin
cd6fadc84c [aurorae] Change QML for themes to QtQuick 2
Needed for getting proper previews in the QtQuick 2 based kcm.
Obviously this breaks Aurorae as Aurorae is not yet migrated to
QtQuick 2. But there is no more broken than broken anyway.
2013-10-01 14:05:50 +02:00
Martin Gräßlin
969e6b85e7 Merge branch 'master' into frameworks-scratch
Conflicts:
	CMakeLists.txt
	kwin/client.cpp
	kwin/effects/highlightwindow/highlightwindow.cpp
	kwin/libkwineffects/kwingltexture.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/scene_opengl.cpp
	kwin/workspace.cpp
	plasma/desktop/applets/kickoff/CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/code/tools.js
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
	plasma/desktop/applets/taskmanager/package/metadata.desktop
	plasma/desktop/applets/taskmanager/plugin/textlabel.h
	plasma/desktop/applets/tasks/CMakeLists.txt
	plasma/desktop/applets/tasks/package/metadata.desktop
	plasma/desktop/applets/tasks/tasks.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/generic/applets/activitybar/activitybar.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-09-24 11:28:38 +02:00
Martin Gräßlin
c5e60a7ce8 Add properties for keepAbove/Below to KDecoration
For consistency two new changed signals are introduced without any
argument and the old signals are marked as deprecated.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
7aadeaa310 Add maximized property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot.

The property is of type bool and maps to isMaximized and not to
maximizeMode.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
c918f40a77 Introduce a convenience method isMaximized in KDecoration
Returns true in case of fully maximized, false otherwise. By that
it ignores the horizontal and vertical modes.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
22e4476777 Add icon property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
63bb36e2ad Add shade property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
fd64a29f72 Add desktop property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot.

Also isOnAllDesktop property is added using the same changed
signal as desktop property.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
29bce13e9f Add caption property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot
2013-09-12 09:27:39 +02:00
Martin Gräßlin
e1c4512ccc Add active property and changed signal to KDecoration
Replaces the pure virtual method which the Decoration had to
implement. Instead the Decoration can now connect to the signal.

For KCommonDecoration there is no change at all except that the
invoked method is turned into a slot.
2013-09-12 09:27:39 +02:00
Martin Gräßlin
287ddf8446 Remove reset method from OxygenClient
Connects to the appropriate changed signals instead.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
d10a31750e Drop reset method from K(Common)Decoration
For the only remaining update flag a dedicated signal is added to
KDecoration.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
2f2e17ac19 Drop reset from AuroraeClient
Was only delegating to parent class thus not doing anything.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
69be5b3e25 Oxygen connects to the new KDecorationOptions signals
At least to those it is interested in.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
9797fe2122 Aurorae connects to new changed signals by KDecorationOptions
No longer implements the reset() method by KDecorationFactory.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
784c40a338 KDecorationFactory inherits from QObject
Adjusting to reality: our decorations have the factory already inheriting
from QObject.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
10e044151e Drop KDecorationFactoryUnstable
Did nothing and no longer needed.
2013-09-12 09:27:38 +02:00
Martin Gräßlin
a90072d753 Merge KDecorationUnstable into KDecoration
Also KCommonDecorationUnstable is merged into KCommonDecoration.
2013-09-12 09:27:38 +02:00