Commit graph

2813 commits

Author SHA1 Message Date
l10n daemon script
b5b8dee854 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-28 10:04:21 +00:00
Martin Gräßlin
1f6c0c07f7 [effects] Support blitScreenshot on OpenGLES
As OpenGL ES 3.0 supports framebuffer blit, we don't have to ifdef it
any more.
2015-06-24 09:40:53 +02:00
l10n daemon script
4b8fabca40 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-22 10:30:10 +00:00
Boudewijn Rempt
9c2b53dd04 Warnings--: remove set-but-unused variable
Maybe something left over from debugging?
2015-06-12 17:51:02 +02:00
Boudewijn Rempt
1a18eb97ad Remove icon size calculation
The resulting variable wasn't used anywhere, and there weren't any
side-effects from getting the icon size.
2015-06-12 17:50:53 +02:00
Thomas Lübking
cc9a95df5d evenly distribute windows into all corners
If the user has only maximized windows or all
windows crammed into one region of the screen
the effect would not resemble an aperture at all

this ensures a maximum amount of corners is used
while seeking to still use shortest paths

BUG: 348709
FIXED-IN: 5.4
2015-06-10 08:50:17 +02:00
Thomas Lübking
f887c7d4ee Merge branch 'Plasma/5.3' 2015-06-03 21:40:08 +02:00
Thomas Lübking
12fec3f7f5 Maximize effect: skip crossfadign on user resizes
a) close to pointless
b) the target resolution texture is invalid if the resize effect is enabled (as the window was not actually resized)

REVIEW: 123901
2015-06-03 21:17:54 +02:00
l10n daemon script
d07fd3a140 SVN_SILENT made messages (.desktop file) 2015-06-01 11:58:20 +00:00
l10n daemon script
99237c9b3f SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-01 10:08:03 +00:00
l10n daemon script
d0e5e86a30 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-26 13:53:12 +00:00
l10n daemon script
5d473e37ca SVN_SILENT made messages (.desktop file) 2015-05-23 12:49:14 +00:00
l10n daemon script
cdf5ef113a SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-23 11:09:17 +00:00
Martin Gräßlin
0258748eb5 Merge branch 'Plasma/5.3' 2015-05-21 13:33:53 +02:00
Thomas Lübking
ae31aaaa13 fix presentwindows crash on disabling closebuttons
m_closeWindow "dangles" and protects m_closeView access
in postPaintScreen

REVIEW: 123865
2015-05-21 09:42:57 +02:00
Thomas Lübking
12358f839a no VBO upload for zero vertex count
causes out of bounds segfault

BUG: 347900
REVIEW: 123865
FIXED-IN: 5.3.1
2015-05-21 09:42:29 +02:00
Martin Gräßlin
efdd9c762b Merge branch 'Plasma/5.3' 2015-05-20 15:17:17 +02:00
Martin Gräßlin
00dd1ad0fa [effects] Fix loading of trackmouse effect textures
Logic error preventing the textures from loading.

REVIEW: 123862
2015-05-20 14:47:23 +02:00
l10n daemon script
7724edac14 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-20 09:47:00 +00:00
Thomas Lübking
8ba16371e7 stall wobbling while screen is transformed
transformed screens prevent hardware clipping
leading through filtering subquads
This requires to subquad in the painting pass
what is not supported for non rectangular
qauds ands presently aborts (in debug builds)
if any quad is transformed (as by eg. the wobbling)

REVIEW: 123733
BUG: 338972
2015-05-15 23:55:28 +02:00
Thomas Lübking
c56d64b837 desk grid: do not recreate DesktopButtonsViews
Same issue as with present windows closers: qml is slow
Interestingly "hide" means "hide" here and there're also
no visual artifacts.

BUG: 347339
REVIEW: 123668
2015-05-15 23:55:27 +02:00
Thomas Lübking
0da58680fc window aperture always needs to cancel
even if the window is invisible
fade out instead of NOOP or "restorage"

BUG: 347174
REVIEW: 123636
2015-05-15 23:55:26 +02:00
Thomas Lübking
7a6ee1c7bb break desktopshowing state from cover & flipswitch
REVIEW: 123550
CCBUG: 346837
2015-05-15 23:55:26 +02:00
Thomas Lübking
82e0601af9 stall wobbling while screen is transformed
transformed screens prevent hardware clipping
leading through filtering subquads
This requires to subquad in the painting pass
what is not supported for non rectangular
qauds ands presently aborts (in debug builds)
if any quad is transformed (as by eg. the wobbling)

REVIEW: 123733
BUG: 338972
2015-05-15 22:02:47 +02:00
Thomas Lübking
0b334f2a70 desk grid: do not recreate DesktopButtonsViews
Same issue as with present windows closers: qml is slow
Interestingly "hide" means "hide" here and there're also
no visual artifacts.

BUG: 347339
REVIEW: 123668
2015-05-15 21:59:00 +02:00
Thomas Lübking
e0c3b4eed3 window aperture always needs to cancel
even if the window is invisible
fade out instead of NOOP or "restorage"

BUG: 347174
REVIEW: 123636
2015-05-15 21:58:41 +02:00
Thomas Lübking
7a7d79a168 break desktopshowing state from cover & flipswitch
REVIEW: 123550
CCBUG: 346837
2015-05-15 21:58:30 +02:00
l10n daemon script
f0e0568b37 SVN_SILENT made messages (.desktop file) 2015-05-15 12:12:44 +00:00
l10n daemon script
cea4b7faeb SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-15 10:25:45 +00:00
Sergio Martins
e283bda8e5 Fix unintentional no-op, unite() doesn't change the object
REVIEW: 123618
2015-05-03 22:31:23 +01:00
l10n daemon script
88a15d10ae SVN_SILENT made messages (.desktop file) 2015-04-27 12:17:37 +00:00
l10n daemon script
dc19c0ed02 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-27 10:23:00 +00:00
l10n daemon script
3b93e2e826 SVN_SILENT made messages (.desktop file) 2015-04-25 11:59:16 +00:00
l10n daemon script
f4e2e0e2e9 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-25 10:26:32 +00:00
l10n daemon script
5aeedeb8e9 SVN_SILENT made messages (.desktop file) 2015-04-24 11:33:58 +00:00
l10n daemon script
7c747e1591 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-24 09:53:59 +00:00
l10n daemon script
e8a070ac30 SVN_SILENT made messages (.desktop file) 2015-04-23 11:53:06 +00:00
l10n daemon script
7037327ec4 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-23 10:15:53 +00:00
l10n daemon script
d4af45da2d SVN_SILENT made messages (.desktop file) 2015-04-21 14:57:25 +00:00
l10n daemon script
a00f1f3ad4 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-21 13:24:50 +00:00
l10n daemon script
0a6668c53b SVN_SILENT made messages (.desktop file) 2015-04-18 11:59:40 +00:00
l10n daemon script
5cd7658930 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-18 10:28:01 +00:00
l10n daemon script
d18b931f55 SVN_SILENT made messages (.desktop file) 2015-04-17 13:13:21 +00:00
Lasse Liehu
5f9a6278d0 Add disambiguation context
REVIEW: 123396
2015-04-17 15:56:58 +03:00
l10n daemon script
ef748afe63 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-17 11:43:23 +00:00
l10n daemon script
5a093d134c SVN_SILENT made messages (.desktop file) 2015-04-14 15:25:55 +00:00
l10n daemon script
53392ea009 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-14 13:53:56 +00:00
l10n daemon script
8b1f42314c SVN_SILENT made messages (.desktop file) 2015-04-12 12:16:24 +00:00
l10n daemon script
63a0b4133e SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-12 10:31:39 +00:00
l10n daemon script
1a1a6cd8bf SVN_SILENT made messages (.desktop file) 2015-04-11 12:07:56 +00:00