← Back to branch summary

~cern-kicad/kicad/kicad-gal

« back to all changes in this revision

Viewing changes to pagelayout_editor/events_functions.cpp

  • Committer: Maciej Suminski
  • Date: 2013-08-05 12:46:05 UTC
  • mfrom: (4024.1.244 kicad)
  • Revision ID: maciej.suminski@cern.ch-20130805124605-9a4rcl8likw6vptc
Upstream merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pagelayout_editor/events_functions.cpp
250
250
    WORKSHEET_DATAITEM *item = screen->GetCurItem();
251
251
 
252
252
    wxCHECK_RET( (item != NULL), wxT( "Cannot move NULL item." ) );
253
 
    wxPoint position = screen->GetCrossHairPosition()
 
253
    wxPoint position = aPanel->GetParent()->GetCrossHairPosition()
254
254
                      - ( initialCursorPosition - initialPositionUi );
255
255
 
256
256
    if( (item->GetFlags() & LOCATE_STARTPOINT) )
285
285
    aPanel->Refresh();
286
286
}
287
287
 
 
288
 
288
289
void PL_EDITOR_FRAME::MoveItem( WORKSHEET_DATAITEM* aItem )
289
290
{
290
291
    wxCHECK_RET( aItem != NULL, wxT( "Cannot move NULL item" ) );
291
292
    initialPosition = aItem->GetStartPos();
292
293
    initialPositionUi = aItem->GetStartPosUi();
293
 
    initialCursorPosition = GetScreen()->GetCrossHairPosition();
 
294
    initialCursorPosition = GetCrossHairPosition();
294
295
 
295
296
    if( (aItem->GetFlags() & LOCATE_ENDPOINT) )
296
297
    {
300
301
 
301
302
    if( aItem->GetFlags() & (LOCATE_STARTPOINT|LOCATE_ENDPOINT) )
302
303
    {
303
 
        GetScreen()->SetCrossHairPosition( initialPositionUi, false );
304
 
        initialCursorPosition = GetScreen()->GetCrossHairPosition();
 
304
        SetCrossHairPosition( initialPositionUi, false );
 
305
        initialCursorPosition = GetCrossHairPosition();
305
306
        if( m_canvas->IsPointOnDisplay( initialCursorPosition ) )
306
307
        {
307
308
            m_canvas->MoveCursorToCrossHair();
317
318
    GetScreen()->SetCurItem( aItem );
318
319
}
319
320
 
 
321
 
320
322
/**
321
323
* Save in Undo list the layout, and place an item being moved.
322
324
* @param aItem is the item moved