diff options
author | pekdon <pekdon> | 2002-02-16 02:14:54 (GMT) |
---|---|---|
committer | pekdon <pekdon> | 2002-02-16 02:14:54 (GMT) |
commit | 941b6fb9fb136b949096f6afd803301e6611622b (patch) | |
tree | f94a3e0902aeb36cff8623af9e48bb8d4de6a0cc | |
parent | 9ec1ee8a29ff1653d630361fb5002e1d9456e1ff (diff) | |
download | fluxbox_lack-941b6fb9fb136b949096f6afd803301e6611622b.zip fluxbox_lack-941b6fb9fb136b949096f6afd803301e6611622b.tar.bz2 |
shading/unshading fix when maximizing
-rw-r--r-- | src/Window.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc index 59341b7..a85502b 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.26 2002/02/11 11:07:33 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.27 2002/02/16 02:14:54 pekdon Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -2042,6 +2042,8 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
2042 | blackbox_attrib.flags ^= BaseDisplay::ATTRIB_SHADED; | 2042 | blackbox_attrib.flags ^= BaseDisplay::ATTRIB_SHADED; |
2043 | blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_SHADED; | 2043 | blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_SHADED; |
2044 | shaded = false; | 2044 | shaded = false; |
2045 | if (hasTab()) | ||
2046 | getTab()->shade(); | ||
2045 | } | 2047 | } |
2046 | 2048 | ||
2047 | maximized = true; | 2049 | maximized = true; |
@@ -2051,9 +2053,16 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
2051 | tab->raise(); | 2053 | tab->raise(); |
2052 | screen->getWorkspace(workspace_number)->raiseWindow(this); | 2054 | screen->getWorkspace(workspace_number)->raiseWindow(this); |
2053 | setState(current_state); | 2055 | setState(current_state); |
2056 | |||
2054 | } else { | 2057 | } else { |
2055 | maximized = false; | 2058 | maximized = false; |
2056 | 2059 | ||
2060 | if (isShaded()) { | ||
2061 | shade(); | ||
2062 | if (hasTab()) | ||
2063 | getTab()->shade(); | ||
2064 | } | ||
2065 | |||
2057 | blackbox_attrib.flags &= ! (BaseDisplay::ATTRIB_MAXHORIZ | BaseDisplay::ATTRIB_MAXVERT); | 2066 | blackbox_attrib.flags &= ! (BaseDisplay::ATTRIB_MAXHORIZ | BaseDisplay::ATTRIB_MAXVERT); |
2058 | blackbox_attrib.attrib &= ! (BaseDisplay::ATTRIB_MAXHORIZ | BaseDisplay::ATTRIB_MAXVERT); | 2067 | blackbox_attrib.attrib &= ! (BaseDisplay::ATTRIB_MAXHORIZ | BaseDisplay::ATTRIB_MAXVERT); |
2059 | 2068 | ||
@@ -2066,6 +2075,7 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
2066 | redrawAllButtons(); | 2075 | redrawAllButtons(); |
2067 | setState(current_state); | 2076 | setState(current_state); |
2068 | } | 2077 | } |
2078 | |||
2069 | if (tab) //resize all the windows in the tab group | 2079 | if (tab) //resize all the windows in the tab group |
2070 | tab->resize(); | 2080 | tab->resize(); |
2071 | } | 2081 | } |