Skip to content

Commit

Permalink
Merge pull request #542 from jongough/updates
Browse files Browse the repository at this point in the history 
Update to keep the resized size temporarily whilst working with paths
  • Loading branch information
@jongough
jongough committed Nov 26, 2023
2 parents 4d18a29 + e9e01f9 commit 2de032d
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ set(PACKAGE "ocpn_draw")

set(VERSION_MAJOR "1")
set(VERSION_MINOR "8")
set(VERSION_PATCH "43")
set(VERSION_PATCH "44")
set(VERSION_TWEAK "0")
set(VERSION_DATE "25/11/2023") # DD/MM/YYYY forma0t
set(VERSION_DATE "26/11/2023") # DD/MM/YYYY forma0t
set(OCPN_MIN_VERSION "ov50")
set(OCPN_API_VERSION_MAJOR "1")
set(OCPN_API_VERSION_MINOR "17")
Expand Down
60 changes: 30 additions & 30 deletions Forms/PathAndPointManagerDialog.fbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,25 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer19</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer16</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxNotebook" expanded="1">
<object class="wxNotebook" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -138,11 +138,11 @@
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnNotebookPageChanged">OnTabSwitch</event>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">Paths</property>
<property name="select">1</property>
<object class="wxPanel" expanded="1">
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -193,25 +193,25 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_NONE|wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer2</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer17</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer202</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -286,11 +286,11 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">m_bSizerPathButtons</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -748,11 +748,11 @@
</object>
</object>
</object>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">OD Points</property>
<property name="select">0</property>
<object class="wxPanel" expanded="1">
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -803,25 +803,25 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer3</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer18</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer21</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -896,11 +896,11 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">m_bSizerODPointsButtons</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -1356,11 +1356,11 @@
</object>
</object>
</object>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">Layers</property>
<property name="select">0</property>
<object class="wxPanel" expanded="1">
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -1411,25 +1411,25 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer4</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer191</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer22</property>
<property name="orient">wxVERTICAL</property>
Expand Down
2 changes: 2 additions & 0 deletions include/PathAndPointManagerDialogImpl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ class PathAndPointManagerDialogImpl : public PathAndPointManagerDialogDef
int m_CharWidth;
int m_CharHeight;

wxSize m_szDialogSize;

wxFont *m_dialogLabelFont;

wxWindow *m_parent_window;
Expand Down
16 changes: 8 additions & 8 deletions src/PathAndPointManagerDialogImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ int wxCALLBACK SortPathOnVis(long item1, long item2, long list)
if(it2 == it1)
return 0;
if(sort_path_on_vis & 1)
if(it2 && !it1)
if(it2 == true && it1 == false)
return 1;
else
return -1;
else
if(!it2 && it1)
if(it2 == false && it1 == true)
return 1;
else
return -1;
Expand Down Expand Up @@ -412,6 +412,7 @@ PathAndPointManagerDialogImpl::PathAndPointManagerDialogImpl(wxWindow* parent)
UpdateLayerListCtrl();

RecalculateSize();
m_szDialogSize = GetSize();

this-Layout();

Expand Down Expand Up @@ -777,14 +778,13 @@ void PathAndPointManagerDialogImpl::OnPathActivateClick( wxCommandEvent &event )

int item_num = 1;
bool b_activate_paths = true;
ODPath *ppath;
for ( ;; ++item_num )
{
item = m_listCtrlPath->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if ( item == -1 )
break;

ppath = (ODPath *) m_listCtrlPath->GetItemData( item );
ODPath *ppath = reinterpret_cast<ODPath *>(m_listCtrlPath->GetItemData( item ));

if( !ppath ) continue;

Expand All @@ -810,9 +810,9 @@ void PathAndPointManagerDialogImpl::OnPathActivateClick( wxCommandEvent &event )
}

if( b_activate_paths )
g_pPathMan->ActivatePath( (ODPath *) ppath );
g_pPathMan->ActivatePath( ppath );
else
g_pPathMan->DeactivatePath( (ODPath *) ppath );
g_pPathMan->DeactivatePath( ppath );

g_pODConfig->UpdatePath( ppath );

Expand Down Expand Up @@ -1019,7 +1019,6 @@ void PathAndPointManagerDialogImpl::UpdatePathListCtrl( bool b_retain_selection
// (the next path will get that index).
if( selected_id > -1 ) {
for( int i = 0; i < i_itemcount; ++i ) {
item = m_listCtrlPath->FindItem( -1, l_selection[i] );
m_listCtrlPath->SetItemState( l_selection[i], wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
}
Expand All @@ -1037,7 +1036,8 @@ void PathAndPointManagerDialogImpl::UpdatePathListCtrl( bool b_retain_selection
}

m_bSizerPathButtons->Layout();
SetSizerAndFit(m_bSizerDialog);
if( m_szDialogSize == GetSize())
SetSizerAndFit(m_bSizerDialog);

delete [] l_selection;

Expand Down

0 comments on commit 2de032d

Please sign in to comment.