summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Window.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 6b55372..cbd5b84 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.142 2003/04/16 14:43:04 rathnor Exp $ 25// $Id: Window.cc,v 1.143 2003/04/16 22:17:46 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -175,9 +175,6 @@ public:
175 explicit SetClientCmd(WinClient &client):m_client(client) { 175 explicit SetClientCmd(WinClient &client):m_client(client) {
176 } 176 }
177 void execute() { 177 void execute() {
178#ifdef DEBUG
179 cerr<<"SetClientCmd"<<endl;
180#endif // DEBUG
181 if (m_client.m_win != 0) 178 if (m_client.m_win != 0)
182 m_client.m_win->setCurrentClient(m_client); 179 m_client.m_win->setCurrentClient(m_client);
183 } 180 }
@@ -303,6 +300,8 @@ void FluxboxWindow::init() {
303 m_client->window()<<", frame = "<<m_frame.window().window()<<dec<<")"<<endl; 300 m_client->window()<<", frame = "<<m_frame.window().window()<<dec<<")"<<endl;
304 301
305#endif // DEBUG 302#endif // DEBUG
303
304 m_frame.resize(m_client->width(), m_client->height());
306 TextButton *btn = new TextButton(m_frame.label(), 305 TextButton *btn = new TextButton(m_frame.label(),
307 m_frame.theme().font(), 306 m_frame.theme().font(),
308 m_client->title()); 307 m_client->title());
@@ -320,7 +319,7 @@ void FluxboxWindow::init() {
320 btn->setOnClick(set_client_cmd); 319 btn->setOnClick(set_client_cmd);
321 evm.add(*this, btn->window()); // we take care of button events for this 320 evm.add(*this, btn->window()); // we take care of button events for this
322 321
323 m_frame.reconfigure(); 322 // m_frame.reconfigure();
324 323
325 // redirect events from frame to us 324 // redirect events from frame to us
326 325
@@ -377,7 +376,6 @@ void FluxboxWindow::init() {
377 m_client->old_bw = wattrib.border_width; 376 m_client->old_bw = wattrib.border_width;
378 m_client->x = wattrib.x; m_client->y = wattrib.y; 377 m_client->x = wattrib.x; m_client->y = wattrib.y;
379 378
380
381 Fluxbox *fluxbox = Fluxbox::instance(); 379 Fluxbox *fluxbox = Fluxbox::instance();
382 380
383 fluxbox->saveWindowSearch(m_frame.window().window(), this); 381 fluxbox->saveWindowSearch(m_frame.window().window(), this);
@@ -473,8 +471,9 @@ void FluxboxWindow::init() {
473 } 471 }
474 472
475 setState(current_state); 473 setState(current_state);
476 // m_frame.resizeForClient(wattrib.width, wattrib.height); 474 m_frame.resizeForClient(wattrib.width, wattrib.height);
477 m_frame.reconfigure(); 475 m_frame.reconfigure();
476 sendConfigureNotify();
478 // no focus default 477 // no focus default
479 setFocusFlag(false); 478 setFocusFlag(false);
480 479