aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 0504deb..a165d90 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -924,7 +924,7 @@ FluxboxWindow::ClientList::iterator FluxboxWindow::getClientInsertPosition(int x
924 ClientList::iterator client = find(m_clientlist.begin(), 924 ClientList::iterator client = find(m_clientlist.begin(),
925 m_clientlist.end(), 925 m_clientlist.end(),
926 it->first); 926 it->first);
927 if (x > (*it).second->width() / 2) 927 if (x > static_cast<signed>((*it).second->width()) / 2)
928 client++; 928 client++;
929 929
930 return client; 930 return client;
@@ -960,7 +960,7 @@ void FluxboxWindow::moveClientTo(WinClient &win, int x, int y) {
960 dest_x, dest_y, &x, &y, 960 dest_x, dest_y, &x, &y,
961 &child_return)) 961 &child_return))
962 return; 962 return;
963 if (x > (*it).second->width() / 2) 963 if (x > static_cast<signed>((*it).second->width()) / 2)
964 moveClientRightOf(win, *it->first); 964 moveClientRightOf(win, *it->first);
965 else 965 else
966 moveClientLeftOf(win, *it->first); 966 moveClientLeftOf(win, *it->first);
@@ -2296,7 +2296,7 @@ void FluxboxWindow::popupMenu() {
2296 int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth(); 2296 int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth();
2297 if (!decorations.titlebar) // if we don't have any titlebar 2297 if (!decorations.titlebar) // if we don't have any titlebar
2298 menu_y = 0; 2298 menu_y = 0;
2299 if (m_last_button_x < x() || m_last_button_x > x() + width()) 2299 if (m_last_button_x < x() || m_last_button_x > x() + static_cast<signed>(width()))
2300 m_last_button_x = x(); 2300 m_last_button_x = x();
2301 showMenu(m_last_button_x, menu_y + frame().y()); 2301 showMenu(m_last_button_x, menu_y + frame().y());
2302} 2302}
@@ -2858,8 +2858,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2858 2858
2859 int old_resize_x = m_last_resize_x; 2859 int old_resize_x = m_last_resize_x;
2860 int old_resize_y = m_last_resize_y; 2860 int old_resize_y = m_last_resize_y;
2861 int old_resize_w = m_last_resize_w; 2861 unsigned int old_resize_w = m_last_resize_w;
2862 int old_resize_h = m_last_resize_h; 2862 unsigned int old_resize_h = m_last_resize_h;
2863 2863
2864 // move rectangle 2864 // move rectangle
2865 int gx = 0, gy = 0; 2865 int gx = 0, gy = 0;
@@ -2892,6 +2892,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2892 m_last_resize_y = frame().y() - diff/2; 2892 m_last_resize_y = frame().y() - diff/2;
2893 } 2893 }
2894 break; 2894 break;
2895 default: // kill warning
2896 break;
2895 }; 2897 };
2896 2898
2897 // if not on top or all corner then move bottom 2899 // if not on top or all corner then move bottom
@@ -3567,7 +3569,7 @@ void FluxboxWindow::attachTo(int x, int y, bool interrupted) {
3567 if (client) { 3569 if (client) {
3568 3570
3569 inside_titlebar = client->fbwindow()->hasTitlebar() && 3571 inside_titlebar = client->fbwindow()->hasTitlebar() &&
3570 client->fbwindow()->y() + client->fbwindow()->titlebarHeight() > dest_y; 3572 client->fbwindow()->y() + static_cast<signed>(client->fbwindow()->titlebarHeight()) > dest_y;
3571 3573
3572 Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea(); 3574 Fluxbox::TabsAttachArea area= Fluxbox::instance()->getTabsAttachArea();
3573 if (area == Fluxbox::ATTACH_AREA_WINDOW) 3575 if (area == Fluxbox::ATTACH_AREA_WINDOW)