* $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "ctrl_resize.hpp"
#include "../commands/cmd_resize.hpp"
-CtrlResize::CtrlResize( intf_thread_t *pIntf, CtrlFlat &rCtrl,
- GenericLayout &rLayout, const UString &rHelp,
- VarBool *pVisible ):
- CtrlFlat( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_rCtrl( rCtrl ),
- m_rLayout( rLayout ), m_cmdOutStill( this ),
+CtrlResize::CtrlResize( intf_thread_t *pIntf, WindowManager &rWindowManager,
+ CtrlFlat &rCtrl, GenericLayout &rLayout,
+ const UString &rHelp, VarBool *pVisible,
+ WindowManager::Direction_t direction ):
+ CtrlFlat( pIntf, rHelp, pVisible ), m_fsm( pIntf ),
+ m_rWindowManager( rWindowManager ), m_rCtrl( rCtrl ),
+ m_rLayout( rLayout ), m_direction( direction ), m_cmdOutStill( this ),
m_cmdStillOut( this ),
m_cmdStillStill( this ),
m_cmdStillResize( this ),
}
-void CtrlResize::draw( OSGraphics &rImage, int xDest, int yDest )
+void CtrlResize::draw( OSGraphics &rImage, int xDest, int yDest, int w, int h )
{
- m_rCtrl.draw( rImage, xDest, yDest );
+ m_rCtrl.draw( rImage, xDest, yDest, w, h );
}
}
+void CtrlResize::unsetLayout()
+{
+ m_rCtrl.unsetLayout();
+ CtrlGeneric::unsetLayout();
+}
+
+
const Position *CtrlResize::getPosition() const
{
return m_rCtrl.getPosition();
}
+void CtrlResize::onResize()
+{
+ m_rCtrl.onResize();
+}
+
+
void CtrlResize::handleEvent( EvtGeneric &rEvent )
{
m_pEvt = &rEvent;
}
+void CtrlResize::changeCursor( WindowManager::Direction_t direction ) const
+{
+ OSFactory::CursorType_t cursor;
+ switch( direction )
+ {
+ default:
+ case WindowManager::kNone: cursor = OSFactory::kDefaultArrow; break;
+ case WindowManager::kResizeSE: cursor = OSFactory::kResizeNWSE; break;
+ case WindowManager::kResizeS: cursor = OSFactory::kResizeNS; break;
+ case WindowManager::kResizeE: cursor = OSFactory::kResizeWE; break;
+ }
+ OSFactory::instance( getIntf() )->changeCursor( cursor );
+}
+
+
void CtrlResize::CmdOutStill::execute()
{
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kResizeNWSE );
+ m_pParent->changeCursor( m_pParent->m_direction );
}
void CtrlResize::CmdStillOut::execute()
{
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kDefaultArrow );
+ m_pParent->changeCursor( WindowManager::kNone );
}
void CtrlResize::CmdStillStill::execute()
{
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kResizeNWSE );
+ m_pParent->changeCursor( m_pParent->m_direction );
}
void CtrlResize::CmdStillResize::execute()
{
- EvtMouse *pEvtMouse = (EvtMouse*)m_pParent->m_pEvt;
+ EvtMouse *pEvtMouse = static_cast<EvtMouse*>(m_pParent->m_pEvt);
// Set the cursor
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kResizeNWSE );
+ m_pParent->changeCursor( m_pParent->m_direction );
m_pParent->m_xPos = pEvtMouse->getXPos();
m_pParent->m_yPos = pEvtMouse->getYPos();
m_pParent->m_width = m_pParent->m_rLayout.getWidth();
m_pParent->m_height = m_pParent->m_rLayout.getHeight();
+
+ m_pParent->m_rWindowManager.startResize( m_pParent->m_rLayout,
+ m_pParent->m_direction);
}
void CtrlResize::CmdResizeStill::execute()
{
// Set the cursor
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kResizeNWSE );
+ m_pParent->changeCursor( m_pParent->m_direction );
m_pParent->releaseMouse();
+
+ m_pParent->m_rWindowManager.stopResize();
}
void CtrlResize::CmdResizeResize::execute()
{
- EvtMotion *pEvtMotion = (EvtMotion*)m_pParent->m_pEvt;
+ EvtMotion *pEvtMotion = static_cast<EvtMotion*>(m_pParent->m_pEvt);
- // Set the cursor
- OSFactory *pOsFactory = OSFactory::instance( m_pParent->getIntf() );
- pOsFactory->changeCursor( OSFactory::kResizeNWSE );
+ m_pParent->changeCursor( m_pParent->m_direction );
- int newWidth = pEvtMotion->getXPos() - m_pParent->m_xPos + m_pParent->m_width;
- int newHeight = pEvtMotion->getYPos() - m_pParent->m_yPos + m_pParent->m_height;
+ int newWidth = m_pParent->m_width;
+ newWidth += pEvtMotion->getXPos() - m_pParent->m_xPos;
+ int newHeight = m_pParent->m_height;
+ newHeight += pEvtMotion->getYPos() - m_pParent->m_yPos;
- // Create a resize command
- CmdGeneric *pCmd = new CmdResize( m_pParent->getIntf(), m_pParent->m_rLayout,
+ // Create a resize command, instead of calling the window manager directly.
+ // Thanks to this trick, the duplicate resizing commands will be trashed
+ // in the asynchronous queue, thus making resizing faster
+ CmdGeneric *pCmd = new CmdResize( m_pParent->getIntf(),
+ m_pParent->m_rWindowManager,
+ m_pParent->m_rLayout,
newWidth, newHeight );
// Push the command in the asynchronous command queue
- AsyncQueue *pQueue = AsyncQueue::instance( m_pParent->getIntf() );
- pQueue->push( CmdGenericPtr( pCmd ) );
+ AsyncQueue::instance( getIntf() )->push( CmdGenericPtr( pCmd ) );
}