aboutsummaryrefslogtreecommitdiff
path: root/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
diff options
context:
space:
mode:
authorPaul Tagliamonte <paultag@fluxbox.org>2011-12-10 16:43:24 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2011-12-10 16:43:24 (GMT)
commit5e75c312050185267b05388a3991b932b447a75f (patch)
treeb7b39d55993e612f7bfb373a161f6f5cb4a1f81f /util/fbcompose/plugins/xrender/fade/FadePlugin.cc
parent596c283553fb2da7e9204621347462bb46b83c4d (diff)
downloadfluxbox_paul-fluxbox-gsoc-2011-integration.zip
fluxbox_paul-fluxbox-gsoc-2011-integration.tar.bz2
Fixing up the branch to use some of the changes that were made since the fork.fluxbox-gsoc-2011-integration
The operator "=" was ditched in favor of .reset( because (I'm quoting here): "it was an accident waiting to happen". Well. It builds now.
Diffstat (limited to 'util/fbcompose/plugins/xrender/fade/FadePlugin.cc')
-rw-r--r--util/fbcompose/plugins/xrender/fade/FadePlugin.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
index ac01189..e9fd97c 100644
--- a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
+++ b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
@@ -74,7 +74,10 @@ void FadePlugin::windowMapped(const BaseCompWindow &window) {
74 while (true) { 74 while (true) {
75 if (it == m_negative_fades.end()) { 75 if (it == m_negative_fades.end()) {
76 fade.fade_alpha = 0; 76 fade.fade_alpha = 0;
77 fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter()); 77 fade.fade_picture.reset(
78 new XRenderPicture(
79 xrenderScreen(), m_fade_pict_format,
80 xrenderScreen().pictFilter()));
78 break; 81 break;
79 } else if (it->window_id == window.window()) { 82 } else if (it->window_id == window.window()) {
80 fade.fade_alpha = it->fade_alpha; 83 fade.fade_alpha = it->fade_alpha;
@@ -105,7 +108,8 @@ void FadePlugin::windowUnmapped(const BaseCompWindow &window) {
105 m_positive_fades.erase(it); 108 m_positive_fades.erase(it);
106 } else { 109 } else {
107 fade.fade_alpha = 255; 110 fade.fade_alpha = 255;
108 fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter()); 111 fade.fade_picture.reset( new XRenderPicture(xrenderScreen(),
112 m_fade_pict_format, xrenderScreen().pictFilter()));
109 } 113 }
110 114
111 if (xr_window.contentPicture()->pictureHandle() != None) { 115 if (xr_window.contentPicture()->pictureHandle() != None) {