Merge ~muktupavels/compiz:update-struts into compiz:master

Proposed by Alberts Muktupāvels
Status: Approved
Approved by: Dmitry Shachnev
Approved revision: 5dd1761916a4493e0ee9c00871146ae1236bda8e
Proposed branch: ~muktupavels/compiz:update-struts
Merge into: compiz:master
Diff against target: 40 lines (+0/-8)
1 file modified
src/window.cpp (+0/-8)
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+434957@code.launchpad.net
To post a comment you must log in.

Unmerged commits

5dd1761... by Alberts Muktupāvels

window: remove stray assignments

hasNew is already set to true.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/window.cpp b/src/window.cpp
index 10f0eea..17412be 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1081,8 +1081,6 @@ CompWindow::updateStruts ()
1081 newStrut.left.y = y;1081 newStrut.left.y = y;
1082 newStrut.left.width = width;1082 newStrut.left.width = width;
1083 newStrut.left.height = height;1083 newStrut.left.height = height;
1084
1085 hasNew = true;
1086 }1084 }
1087 else if (x + width == geometry.x () + geometry.width ())1085 else if (x + width == geometry.x () + geometry.width ())
1088 {1086 {
@@ -1090,8 +1088,6 @@ CompWindow::updateStruts ()
1090 newStrut.right.y = y;1088 newStrut.right.y = y;
1091 newStrut.right.width = width;1089 newStrut.right.width = width;
1092 newStrut.right.height = height;1090 newStrut.right.height = height;
1093
1094 hasNew = true;
1095 }1091 }
1096 }1092 }
1097 else1093 else
@@ -1102,8 +1098,6 @@ CompWindow::updateStruts ()
1102 newStrut.top.y = y;1098 newStrut.top.y = y;
1103 newStrut.top.width = width;1099 newStrut.top.width = width;
1104 newStrut.top.height = height;1100 newStrut.top.height = height;
1105
1106 hasNew = true;
1107 }1101 }
1108 else if (y + height == geometry.y () + geometry.height ())1102 else if (y + height == geometry.y () + geometry.height ())
1109 {1103 {
@@ -1111,8 +1105,6 @@ CompWindow::updateStruts ()
1111 newStrut.bottom.y = y;1105 newStrut.bottom.y = y;
1112 newStrut.bottom.width = width;1106 newStrut.bottom.width = width;
1113 newStrut.bottom.height = height;1107 newStrut.bottom.height = height;
1114
1115 hasNew = true;
1116 }1108 }
1117 }1109 }
1118 }1110 }

Subscribers

People subscribed via source and target branches