From babfb29c543490067cae2bcd8313e02fcd10f201 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 2 May 2022 22:31:17 +0100 Subject: [PATCH] Formatting cleanup. --- eeschema/tools/sch_drawing_tools.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp index ef84587800..0b1b121c9b 100644 --- a/eeschema/tools/sch_drawing_tools.cpp +++ b/eeschema/tools/sch_drawing_tools.cpp @@ -788,11 +788,10 @@ int SCH_DRAWING_TOOLS::SingleClickPlace( const TOOL_EVENT& aEvent ) } else if( evt->Category() == TC_COMMAND ) { - if( ( type == SCH_BUS_WIRE_ENTRY_T ) - && ( evt->IsAction( &EE_ACTIONS::rotateCW ) - || evt->IsAction( &EE_ACTIONS::rotateCCW ) - || evt->IsAction( &EE_ACTIONS::mirrorV ) - || evt->IsAction( &EE_ACTIONS::mirrorH ) ) ) + if( ( type == SCH_BUS_WIRE_ENTRY_T ) && ( evt->IsAction( &EE_ACTIONS::rotateCW ) + || evt->IsAction( &EE_ACTIONS::rotateCCW ) + || evt->IsAction( &EE_ACTIONS::mirrorV ) + || evt->IsAction( &EE_ACTIONS::mirrorH ) ) ) { SCH_BUS_ENTRY_BASE* busItem = static_cast( previewItem ); @@ -1217,13 +1216,9 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent ) { // no connected net label found -> open up the new label dialog if( isGlobalLabel ) - { item = createNewText( cursorPos, LAYER_GLOBLABEL ); - } else - { item = createNewText( cursorPos, LAYER_LOCLABEL ); - } } else { @@ -1231,6 +1226,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent ) SCHEMATIC* schematic = getModel(); SCHEMATIC_SETTINGS& sch_settings = schematic->Settings(); SCH_LABEL_BASE* labelItem = nullptr; + if( isGlobalLabel ) { labelItem = new SCH_GLOBALLABEL( cursorPos ); @@ -1247,8 +1243,8 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent ) labelItem->SetBold( m_lastTextBold ); labelItem->SetItalic( m_lastTextItalic ); labelItem->SetTextSpinStyle( m_lastTextOrientation ); - labelItem->SetTextSize( - wxSize( sch_settings.m_DefaultTextSize, sch_settings.m_DefaultTextSize ) ); + labelItem->SetTextSize( wxSize( sch_settings.m_DefaultTextSize, + sch_settings.m_DefaultTextSize ) ); labelItem->SetFlags( IS_NEW | IS_MOVING ); labelItem->SetText( netName ); item = labelItem;