haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new place cursor, fix cursor hotpoints again

This commit is contained in:
Marek Roszko 2020-10-10 23:45:21 -04:00
parent 06144824d1
commit 558f4b4b51
7 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bitmaps_png/cursors/cursor-place.xpm Normal file
View File

@ -0,0 +1,39 @@
/* XPM */
static const char * cursor_place_xpm[] = {
"32 32 4 1",
" c None",
"! c black",
"# c white",
"$ c #008000",
"! ",
"!! ",
"!#! ",
"!##! ",
"!###! ",
"!####! ",
"!#####! ",
"!######! ",
"!#######! ",
"!########! ",
"!#########! ",
"!######!!!!! ",
"!######! ",
"!##!!##! ",
"!#! !###! ",
"!! !##! ",
"! !###! ",
" !#! ",
" !! ## ",
" #$$# ",
" #$$# ",
" ###$$### ",
" #$$$$$$$$# ",
" #$$$$$$$$# ",
" ###$$### ",
" #$$# ",
" #$$# ",
" ## ",
" ",
" ",
" ",
" "};

15
common/cursors.cpp
View File

@ -37,6 +37,7 @@
#include <cursors/cursor-line-wire-add.xpm> #include <cursors/cursor-line-wire-add.xpm>
#include <cursors/cursor-measure.xpm> #include <cursors/cursor-measure.xpm>
#include <cursors/cursor-pencil.xpm> #include <cursors/cursor-pencil.xpm>
#include <cursors/cursor-place.xpm>
#include <cursors/cursor-select-lasso.xpm> #include <cursors/cursor-select-lasso.xpm>
#include <cursors/cursor-select-m.xpm> #include <cursors/cursor-select-m.xpm>
#include <cursors/cursor-select-window.xpm> #include <cursors/cursor-select-window.xpm>
@ -146,7 +147,7 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
nullptr, nullptr,
cursor_text_xpm, cursor_text_xpm,
{ 32, 32 }, { 32, 32 },
{ 7, 10 }, { 7, 7 },
}, },
{ {
KICURSOR::MEASURE, KICURSOR::MEASURE,
@ -218,7 +219,7 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
nullptr, nullptr,
cursor_component_xpm, cursor_component_xpm,
{ 32, 32 }, { 32, 32 },
{ 7, 10 }, { 7, 7 },
}, },
{ {
KICURSOR::SELECT_LASSO, KICURSOR::SELECT_LASSO,
@ -226,7 +227,7 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
nullptr, nullptr,
cursor_select_lasso_xpm, cursor_select_lasso_xpm,
{ 32, 32 }, { 32, 32 },
{ 7, 10 }, { 7, 7 },
}, },
{ {
KICURSOR::SELECT_WINDOW, KICURSOR::SELECT_WINDOW,
@ -276,6 +277,14 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
{ 32, 32 }, { 32, 32 },
{ 7, 7 }, { 7, 7 },
}, },
{
KICURSOR::PLACE,
nullptr,
nullptr,
cursor_place_xpm,
{ 32, 32 },
{ 1, 1 },
},
}; };

2
eeschema/tools/lib_drawing_tools.cpp
View File

@ -94,7 +94,7 @@ int LIB_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
[&]() [&]()
{ {
if( item ) if( item )
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING ); m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PLACE );
else else
m_frame->GetCanvas()->SetCurrentCursor( isText ? KICURSOR::TEXT : KICURSOR::PENCIL ); m_frame->GetCanvas()->SetCurrentCursor( isText ? KICURSOR::TEXT : KICURSOR::PENCIL );
}; };

4
eeschema/tools/sch_drawing_tools.cpp
View File

@ -512,7 +512,7 @@ int SCH_DRAWING_TOOLS::SingleClickPlace( const TOOL_EVENT& aEvent )
auto setCursor = auto setCursor =
[&]() [&]()
{ {
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ARROW ); m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PLACE );
}; };
// Set initial cursor // Set initial cursor
@ -836,7 +836,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
[&]() [&]()
{ {
if( item ) if( item )
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING ); m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PLACE );
else if( isText ) else if( isText )
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::TEXT ); m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::TEXT );
else if( isGlobalLabel ) else if( isGlobalLabel )

3
include/cursors.h
View File

@ -58,7 +58,8 @@ enum class KICURSOR
LINE_GRAPHIC, LINE_GRAPHIC,
LINE_WIRE, LINE_WIRE,
LINE_WIRE_ADD, LINE_WIRE_ADD,
LABEL_HIER LABEL_HIER,
PLACE
}; };
/** /**

2
pagelayout_editor/tools/pl_drawing_tools.cpp
View File

@ -94,7 +94,7 @@ int PL_DRAWING_TOOLS::PlaceItem( const TOOL_EVENT& aEvent )
[&]() [&]()
{ {
if( item ) if( item )
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING ); m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PLACE );
else else
m_frame->GetCanvas()->SetCurrentCursor( isText ? KICURSOR::TEXT : KICURSOR::PENCIL ); m_frame->GetCanvas()->SetCurrentCursor( isText ? KICURSOR::TEXT : KICURSOR::PENCIL );
}; };

6
pcbnew/tools/pcb_tool_base.cpp
View File

@ -82,13 +82,13 @@ void PCB_TOOL_BASE::doInteractiveItemPlacement( const std::string& aTool,
if( aOptions & IPO_SINGLE_CLICK ) if( aOptions & IPO_SINGLE_CLICK )
makeNewItem( controls()->GetCursorPosition() ); makeNewItem( controls()->GetCursorPosition() );
auto setCursor = auto setCursor =
[&]() [&]()
{ {
if( !newItem ) if( !newItem )
frame()->GetCanvas()->SetCurrentCursor( KICURSOR::PENCIL ); frame()->GetCanvas()->SetCurrentCursor( KICURSOR::PENCIL );
else else
frame()->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING ); frame()->GetCanvas()->SetCurrentCursor( KICURSOR::PLACE );
}; };
// Set initial cursor // Set initial cursor