diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Window.cc b/src/Window.cc index 846da0e..4a84457 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.56 2002/06/02 22:43:20 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.57 2002/06/02 23:35:30 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1265,10 +1265,10 @@ void FluxboxWindow::reconfigure() { | |||
1265 | else if (current_state == WithdrawnState) | 1265 | else if (current_state == WithdrawnState) |
1266 | tab->withdraw(); | 1266 | tab->withdraw(); |
1267 | } | 1267 | } |
1268 | } else { | 1268 | } else { |
1269 | if (tab) { //got a tab? then destroy it | 1269 | if (tab != 0) { //got a tab? then destroy it |
1270 | delete tab; | 1270 | delete tab; |
1271 | tab=0; | 1271 | tab = 0; |
1272 | } | 1272 | } |
1273 | } | 1273 | } |
1274 | 1274 | ||
@@ -1276,7 +1276,7 @@ void FluxboxWindow::reconfigure() { | |||
1276 | client.y = frame.y + frame.y_border + frame.mwm_border_w + | 1276 | client.y = frame.y + frame.y_border + frame.mwm_border_w + |
1277 | screen->getBorderWidth(); | 1277 | screen->getBorderWidth(); |
1278 | 1278 | ||
1279 | if (getTitle().size()>0) { | 1279 | if (getTitle().size() > 0) { |
1280 | if (I18n::instance()->multibyte()) { | 1280 | if (I18n::instance()->multibyte()) { |
1281 | XRectangle ink, logical; | 1281 | XRectangle ink, logical; |
1282 | XmbTextExtents(screen->getWindowStyle()->font.set, | 1282 | XmbTextExtents(screen->getWindowStyle()->font.set, |
@@ -2889,7 +2889,8 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) { | |||
2889 | 2889 | ||
2890 | case XA_WM_ICON_NAME: | 2890 | case XA_WM_ICON_NAME: |
2891 | getWMIconName(); | 2891 | getWMIconName(); |
2892 | if (iconic) screen->iconUpdate(); | 2892 | if (iconic) |
2893 | screen->iconUpdate(); | ||
2893 | updateIcon(); | 2894 | updateIcon(); |
2894 | break; | 2895 | break; |
2895 | 2896 | ||
@@ -2916,10 +2917,10 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) { | |||
2916 | if ((client.normal_hint_flags & PMinSize) && | 2917 | if ((client.normal_hint_flags & PMinSize) && |
2917 | (client.normal_hint_flags & PMaxSize)) { | 2918 | (client.normal_hint_flags & PMaxSize)) { |
2918 | if (client.max_width <= client.min_width && | 2919 | if (client.max_width <= client.min_width && |
2919 | client.max_height <= client.min_height) | 2920 | client.max_height <= client.min_height) { |
2920 | decorations.maximize = decorations.handle = | 2921 | decorations.maximize = decorations.handle = |
2921 | functions.resize = functions.maximize = false; | 2922 | functions.resize = functions.maximize = false; |
2922 | else { | 2923 | } else { |
2923 | decorations.handle = false; | 2924 | decorations.handle = false; |
2924 | decorations.maximize = functions.resize = functions.maximize = true; | 2925 | decorations.maximize = functions.resize = functions.maximize = true; |
2925 | } | 2926 | } |