aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index f77d79e..faeec93 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.276 2004/04/12 18:19:10 fluxgen Exp $ 25// $Id: Window.cc,v 1.277 2004/04/12 23:03:34 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -393,8 +393,8 @@ void FluxboxWindow::init() {
393 393
394 394
395 FbTk::TextButton *btn = new FbTk::TextButton(frame().label(), 395 FbTk::TextButton *btn = new FbTk::TextButton(frame().label(),
396 frame().theme().font(), 396 frame().theme().font(),
397 m_client->title()); 397 m_client->title());
398 btn->setJustify(frame().theme().justify()); 398 btn->setJustify(frame().theme().justify());
399 m_labelbuttons[m_client] = btn; 399 m_labelbuttons[m_client] = btn;
400 frame().addLabelButton(*btn); 400 frame().addLabelButton(*btn);
@@ -2354,8 +2354,8 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
2354 m_button_grab_y = be.y_root - frame().y() - frame().window().borderWidth(); 2354 m_button_grab_y = be.y_root - frame().y() - frame().window().borderWidth();
2355 } 2355 }
2356 2356
2357 if (m_windowmenu.isVisible()) 2357 Fluxbox::instance()->hideExtraMenus(screen());
2358 m_windowmenu.hide(); 2358 screen().hideWindowMenus(this);
2359 } 2359 }
2360} 2360}
2361 2361
@@ -3523,7 +3523,8 @@ void FluxboxWindow::setupWindow() {
3523 */ 3523 */
3524void FluxboxWindow::reconfigTheme() { 3524void FluxboxWindow::reconfigTheme() {
3525 3525
3526 m_frame.setBorderWidth(decorations.border?frame().theme().border().width():0); 3526 m_frame.setBorderWidth(decorations.border ?
3527 frame().theme().border().width() : 0);
3527 if (decorations.handle && frame().theme().handleWidth() != 0) 3528 if (decorations.handle && frame().theme().handleWidth() != 0)
3528 frame().showHandle(); 3529 frame().showHandle();
3529 else 3530 else
@@ -3545,7 +3546,7 @@ void FluxboxWindow::reconfigTheme() {
3545 sendConfigureNotify(); 3546 sendConfigureNotify();
3546} 3547}
3547 3548
3548// grab pointer an increase counter. 3549// grab pointer and increase counter.
3549// we need this to count grab pointers, 3550// we need this to count grab pointers,
3550// especially at startup, where we can drag/resize while starting 3551// especially at startup, where we can drag/resize while starting
3551// and causing it to send events to windows later on and make 3552// and causing it to send events to windows later on and make