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

ensure sane values for ResizeCmd

Browse source
This commit is contained in:
mathias 2004-11-22 18:46:59 +00:00
parent 57da3c545f
commit 5525d29b9b
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/CurrentWindowCmd.cc
View file

@ -86,14 +86,22 @@ void MoveCmd::real_execute() {
}
ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
template<typename T>
T max(const T& a, const T& b) {
return a >= b ? a : b;
}
void ResizeCmd::real_execute() {
fbwindow().resize(
fbwindow().width() +
m_step_size_x * fbwindow().winClient().width_inc,
fbwindow().height() +
m_step_size_y * fbwindow().winClient().height_inc);
int w = max<int>(static_cast<int>(fbwindow().width() +
m_step_size_x * fbwindow().winClient().width_inc),
fbwindow().frame().titlebarHeight() * 2 + 10);
int h = max<int>(static_cast<int>(fbwindow().height() +
m_step_size_y * fbwindow().winClient().height_inc),
fbwindow().frame().titlebarHeight() + 10);
fbwindow().resize(w, h);
}
MoveToCmd::MoveToCmd(const int step_size_x, const int step_size_y) :
@ -107,5 +115,6 @@ ResizeToCmd::ResizeToCmd(const int step_size_x, const int step_size_y) :
m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
void ResizeToCmd::real_execute() {
fbwindow().resize(m_step_size_x, m_step_size_y);
if (m_step_size_x > 0 && m_step_size_y > 0)
fbwindow().resize(m_step_size_x, m_step_size_y);
}