Commit dcb5d8f2 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Merged Tom's branch

parents 3f6fa861 75b59d8f

common/gal/graphics_abstraction_layer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ GAL::GAL() : 


    // Initialize the cursor shape

    SetCursorColor( COLOR4D( 1.0, 1.0, 1.0, 1.0 ) );

    SetCursorSize( 15 );

    SetCursorEnabled( true );

    SetCursorSize( 80 );

    SetCursorEnabled( false );



    strokeFont.LoadNewStrokeFont( newstroke_font, newstroke_font_bufsize );

}

common/gal/opengl/opengl_gal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener, 


    SetSize( aParent->GetSize() );

    screenSize = VECTOR2D( aParent->GetSize() );

    initCursor( 20 );

    initCursor( 80 );



    // Grid color settings are different in Cairo and OpenGL

    SetGridColor( COLOR4D( 0.8, 0.8, 0.8, 0.1 ) );

common/geometry/shape_line_chain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ SHAPE_LINE_CHAIN& SHAPE_LINE_CHAIN::Simplify() 
const VECTOR2I SHAPE_LINE_CHAIN::NearestPoint(const VECTOR2I& aP) const

{

	int min_d = INT_MAX;

	int nearest;

	int nearest = 0;

	for ( int i = 0; i < SegmentCount() ; i++ )

	{

		int d = CSegment(i).Distance(aP);

common/profile.h

+4 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
 * @brief Simple profiling functions for measuring code execution time.

 */



#ifndef __PROFILE_H

#define __PROFILE_H

#ifndef __TPROFILE_H

#define __TPROFILE_H



#include <sys/time.h>

#include <stdint.h>
@@ -96,7 +96,6 @@ static inline uint64_t get_tics() 
    gettimeofday( &tv, NULL );



    return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec;

#endif

}
@@ -144,3 +143,5 @@ static inline void prof_end( prof_counter* cnt ) 
    else

        cnt->value = get_tics() - cnt->value;

}



#endif

common/view/view.cpp

+8 −0
Original line number Diff line number Diff line
@@ -452,6 +452,14 @@ void VIEW::ChangeLayerDepth( int aLayer, int aDepth ) 
    m_layers[aLayer].items->Query( r, visitor );

}



int VIEW::GetTopLayer( ) const

{

    if( m_topLayers.size() == 0 )

        return 0;



    return *m_topLayers.begin();

}





void VIEW::SetTopLayer( int aLayer, bool aEnabled )

{