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

Another attempt to fix the textbox scrollbars on GTK. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4207
This commit is contained in:
Jeff Young 2020-04-18 21:40:54 +01:00
parent 2b6089240a
commit 895f46da8f
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/dialogs/dialog_edit_label.cpp
View File

@ -118,7 +118,6 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe
m_valueMultiLine->SetEOLMode( wxSTC_EOL_LF );
m_valueMultiLine->SetUseHorizontalScrollBar( false );
m_valueMultiLine->SetUseVerticalScrollBar( false );
if( m_CurrentText->IsMultilineAllowed() )
{

3
eeschema/dialogs/dialog_edit_label_base.cpp
View File

@ -22,6 +22,7 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID
m_textEntrySizer->SetFlexibleDirection( wxBOTH );
m_textEntrySizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_textEntrySizer->SetMinSize( wxSize( 500,-1 ) );
m_labelSingleLine = new wxStaticText( this, wxID_ANY, _("Label:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelSingleLine->Wrap( -1 );
m_labelSingleLine->SetToolTip( _("Enter the text to be used within the schematic") );
@ -66,8 +67,6 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID
m_valueMultiLine->MarkerDefine( wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY );
m_valueMultiLine->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
m_valueMultiLine->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
m_valueMultiLine->SetMinSize( wxSize( 480,100 ) );
m_textEntrySizer->Add( m_valueMultiLine, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_labelCombo = new wxStaticText( this, wxID_ANY, _("Label:"), wxDefaultPosition, wxDefaultSize, 0 );

4
eeschema/dialogs/dialog_edit_label_base.fbp
View File

@ -68,7 +68,7 @@
<property name="growablecols">1</property>
<property name="growablerows">1</property>
<property name="hgap">3</property>
<property name="minimum_size"></property>
<property name="minimum_size">500,-1</property>
<property name="name">m_textEntrySizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
@ -302,7 +302,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">480,100</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_valueMultiLine</property>
<property name="pane_border">1</property>

3
pcbnew/dialogs/dialog_text_properties.cpp
View File

@ -59,6 +59,9 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, BO
{
wxString title;
m_MultiLineText->SetEOLMode( wxSTC_EOL_LF );
m_MultiLineText->SetUseHorizontalScrollBar( false );
m_linesThickness.Show( m_item->Type() == PCB_DIMENSION_T );
if( m_item->Type() == PCB_DIMENSION_T )

2
pcbnew/dialogs/dialog_text_properties_base.cpp
View File

@ -55,7 +55,6 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi
m_MultiLineText->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
m_MultiLineText->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
m_MultiLineText->SetToolTip( _("Enter the text placed on selected layer.") );
m_MultiLineText->SetMinSize( wxSize( 400,60 ) );
m_MultiLineSizer->Add( m_MultiLineText, 1, wxEXPAND | wxALL, 5 );
@ -285,6 +284,7 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi
this->SetSizer( bMainSizer );
this->Layout();
bMainSizer->Fit( this );
this->Centre( wxBOTH );

6
pcbnew/dialogs/dialog_text_properties_base.fbp
View File

@ -45,7 +45,7 @@
<property name="minimum_size">-1,-1</property>
<property name="name">DIALOG_TEXT_PROPERTIES_BASE</property>
<property name="pos"></property>
<property name="size">504,563</property>
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Text Properties</property>
@ -64,7 +64,7 @@
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">20</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="minimum_size">-1,-1</property>
<property name="name">m_MultiLineSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">protected</property>
@ -170,7 +170,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">400,60</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_MultiLineText</property>
<property name="pane_border">1</property>

2
pcbnew/dialogs/dialog_text_properties_base.h
View File

@ -94,7 +94,7 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM
public:
DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 504,563 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU );
DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU );
~DIALOG_TEXT_PROPERTIES_BASE();
};