nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed menu position when we dont have a titlebar and minor cleaning

Browse source
This commit is contained in:
fluxgen 2003-02-20 23:17:36 +00:00
parent 3e2586bc1b
commit 6e1f30c308
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.121 2003/02/19 14:53:38 fluxgen Exp $ // $Id: Window.cc,v 1.122 2003/02/20 23:17:36 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -483,8 +483,9 @@ void FluxboxWindow::positionWindows() {
if (decorations.titlebar) { if (decorations.titlebar) {
m_frame.titlebar().setBorderWidth(screen->getBorderWidth()); m_frame.titlebar().setBorderWidth(screen->getBorderWidth());
m_frame.showTitlebar(); m_frame.showTitlebar();
} else } else {
m_frame.hideTitlebar(); m_frame.hideTitlebar();
}
if (decorations.handle) { if (decorations.handle) {
m_frame.handle().setBorderWidth(screen->getBorderWidth()); m_frame.handle().setBorderWidth(screen->getBorderWidth());
@ -831,7 +832,7 @@ void FluxboxWindow::moveResize(int new_x, int new_y,
if (tab) if (tab)
tab->resize(); tab->resize();
positionWindows(); //positionWindows();
setFocusFlag(focused); setFocusFlag(focused);
shaded = false; shaded = false;
send_event = true; send_event = true;
@ -1636,10 +1637,12 @@ void FluxboxWindow::popupMenu() {
m_windowmenu.hide(); m_windowmenu.hide();
return; return;
} }
// move menu directly under titlebar
int diff_y = m_frame.titlebar().height() + m_frame.titlebar().borderWidth();
if (!decorations.titlebar) // if we don't have any titlebar
diff_y = 0;
m_windowmenu.move(m_last_button_x, m_windowmenu.move(m_last_button_x, m_frame.y() + diff_y);
m_frame.y() + m_frame.titlebar().height() +
m_frame.titlebar().borderWidth()*2);
m_windowmenu.show(); m_windowmenu.show();
m_windowmenu.raise(); m_windowmenu.raise();
} }
@ -1917,9 +1920,10 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
upsize(); upsize();
// reconfigure if the old values changed // reconfigure if the old values changed
if ((x != m_frame.x()) || (y != m_frame.y()) || if (x != m_frame.x() || y != m_frame.y() ||
(w != m_frame.width()) || (h != m_frame.height())) w != m_frame.width() || h != m_frame.height()) {
reconfigure(); moveResize(x, y, w, h);
}
break; break;
} }
@ -1927,9 +1931,10 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
default: default:
if (atom == FbAtoms::instance()->getWMProtocolsAtom()) { if (atom == FbAtoms::instance()->getWMProtocolsAtom()) {
getWMProtocols(); getWMProtocols();
//!!TODO check this area
// reset window actions // reset window actions
screen->setupWindowActions(*this); screen->setupWindowActions(*this);
//!!TODO check this area
} }
break; break;
} }
@ -1946,9 +1951,6 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
if (cr.window != client.window) if (cr.window != client.window)
return; return;
if (! validateClient())
return;
int cx = m_frame.x(), cy = m_frame.y(); int cx = m_frame.x(), cy = m_frame.y();
unsigned int cw = m_frame.width(), ch = m_frame.height(); unsigned int cw = m_frame.width(), ch = m_frame.height();
@ -1959,7 +1961,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
cx = cr.x; cx = cr.x;
if (cr.value_mask & CWY) if (cr.value_mask & CWY)
cy = cr.y - m_frame.titlebar().height(); cy = cr.y - (decorations.titlebar ? m_frame.titlebar().height() : 0);
if (cr.value_mask & CWWidth) if (cr.value_mask & CWWidth)
cw = cr.width; cw = cr.width;
@ -1967,13 +1969,14 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
if (cr.value_mask & CWHeight) if (cr.value_mask & CWHeight)
ch = cr.height; ch = cr.height;
if (m_frame.x() != cx || m_frame.y() != cy ||
m_frame.width() != cw || m_frame.height() != ch) {
// the request is for client window so we resize the frame to it first // the request is for client window so we resize the frame to it first
if (frame().width() != cw || frame().height() != ch)
frame().resizeForClient(cw, ch); frame().resizeForClient(cw, ch);
if (frame().x() != cx || frame().y() != cy)
move(cx, cy); move(cx, cy);
}
if (cr.value_mask & CWStackMode) { if (cr.value_mask & CWStackMode) {
switch (cr.detail) { switch (cr.detail) {