From: Eran I. <no...@so...> - 2014-01-18 22:30:08
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "codelite". The branch, master has been updated via f66479e5bcc001edbb6ed2f916284595dcbe5a01 (commit) from b65da6fae6164cf2c5f4a5e5a933078f1286b8dd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sourceforge.net/p/codelite/codelitegit/ci/f66479e5bcc001edbb6ed2f916284595dcbe5a01 commit f66479e5bcc001edbb6ed2f916284595dcbe5a01 Author: Eran <era...@gm...> Date: Sun Jan 19 00:29:47 2014 +0200 Fixed: when double clicking on frame entry in teh debugger call-stack tab, don't scroll to the top diff --git a/LiteEditor.workspace b/LiteEditor.workspace index 9a367b2..08385ee 100644 --- a/LiteEditor.workspace +++ b/LiteEditor.workspace @@ -44,7 +44,7 @@ <Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/> <Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/> <BuildMatrix> - <WorkspaceConfiguration Name="Win Release Unicode" Selected="no"> + <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes"> <Project Name="abbreviation" ConfigName="WinReleaseUnicode"/> <Project Name="CallGraph" ConfigName="WinReleaseUnicode"/> <Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/> @@ -79,7 +79,7 @@ <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/> <Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes"> + <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no"> <Project Name="abbreviation" ConfigName="WinDebugUnicode"/> <Project Name="CallGraph" ConfigName="WinDebugUnicode"/> <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/> diff --git a/LiteEditor/DebuggerSettings.wxcp b/LiteEditor/DebuggerSettings.wxcp index e1408d8..96a0577 100644 --- a/LiteEditor/DebuggerSettings.wxcp +++ b/LiteEditor/DebuggerSettings.wxcp @@ -2191,7 +2191,7 @@ "m_events": [], "m_children": [{ "m_type": 4403, - "proportion": 1, + "proportion": 0, "border": 5, "gbSpan": "1,1", "gbPosition": "0,0", diff --git a/LiteEditor/debuggersettingsbasedlg.cpp b/LiteEditor/debuggersettingsbasedlg.cpp index c098212..1917398 100644 --- a/LiteEditor/debuggersettingsbasedlg.cpp +++ b/LiteEditor/debuggersettingsbasedlg.cpp @@ -1,5 +1,6 @@ ////////////////////////////////////////////////////////////////////// // This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: DebuggerSettings.wxcp // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// @@ -178,7 +179,7 @@ NewPreDefinedSetBaseDlg::NewPreDefinedSetBaseDlg(wxWindow* parent, wxWindowID id wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL); this->SetSizer(bSizer17); - wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 0); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer2->AddGrowableCol(1); @@ -255,12 +256,12 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx wxBoxSizer* bSizer16 = new wxBoxSizer(wxVERTICAL); m_panel6->SetSizer(bSizer16); - wxFlexGridSizer* flexGridSizer49 = new wxFlexGridSizer( 0, 3, 0, 0); + wxFlexGridSizer* flexGridSizer49 = new wxFlexGridSizer(0, 3, 0, 0); flexGridSizer49->SetFlexibleDirection( wxBOTH ); flexGridSizer49->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer49->AddGrowableCol(1); - bSizer16->Add(flexGridSizer49, 1, wxALL|wxEXPAND, 5); + bSizer16->Add(flexGridSizer49, 0, wxALL|wxEXPAND, 5); m_staticText1 = new wxStaticText(m_panel6, wxID_ANY, _("Debugger path:"), wxDefaultPosition, wxSize(-1, -1), 0); @@ -278,7 +279,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx bSizer16->Add(sbSizer1, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5); - wxGridSizer* gSizer3 = new wxGridSizer( 0, 1, 0, 0); + wxGridSizer* gSizer3 = new wxGridSizer(0, 1, 0, 0); sbSizer1->Add(gSizer3, 0, wxEXPAND, 5); @@ -315,7 +316,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx bSizer16->Add(sbSizer4, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5); - wxGridSizer* gSizer31 = new wxGridSizer( 2, 1, 0, 0); + wxGridSizer* gSizer31 = new wxGridSizer(2, 1, 0, 0); sbSizer4->Add(gSizer31, 0, wxEXPAND, 5); @@ -334,7 +335,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx bSizer16->Add(sbSizer3, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5); - wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer(0, 2, 0, 0); fgSizer21->SetFlexibleDirection( wxBOTH ); fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -452,7 +453,7 @@ DbgPageMiscBase::DbgPageMiscBase(wxWindow* parent, wxWindowID id, const wxPoint& bSizer17->Add(sbSizer6, 0, wxLEFT|wxRIGHT|wxEXPAND, 5); - wxGridSizer* gSizer5 = new wxGridSizer( 0, 1, 0, 0); + wxGridSizer* gSizer5 = new wxGridSizer(0, 1, 0, 0); sbSizer6->Add(gSizer5, 0, wxEXPAND, 5); @@ -570,7 +571,7 @@ DebuggerDisassemblyTabBase::DebuggerDisassemblyTabBase(wxWindow* parent, wxWindo wxBoxSizer* boxSizer14 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer14); - wxFlexGridSizer* flexGridSizer22 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* flexGridSizer22 = new wxFlexGridSizer(0, 2, 0, 0); flexGridSizer22->SetFlexibleDirection( wxBOTH ); flexGridSizer22->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer22->AddGrowableCol(1); diff --git a/LiteEditor/debuggersettingsbasedlg.h b/LiteEditor/debuggersettingsbasedlg.h index 1526d57..4c39465 100644 --- a/LiteEditor/debuggersettingsbasedlg.h +++ b/LiteEditor/debuggersettingsbasedlg.h @@ -1,5 +1,6 @@ ////////////////////////////////////////////////////////////////////// // This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: DebuggerSettings.wxcp // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// diff --git a/LiteEditor/listctrlpanel.cpp b/LiteEditor/listctrlpanel.cpp index 79691e3..c66441d 100644 --- a/LiteEditor/listctrlpanel.cpp +++ b/LiteEditor/listctrlpanel.cpp @@ -64,7 +64,7 @@ void ListCtrlPanel::Update ( const StackEntryArray &stackArr ) { Clear(); m_stack.insert(m_stack.end(), stackArr.begin(), stackArr.end()); - + int activeFrame (-1); if (!m_stack.empty()) { for (int i=0; i<(int)m_stack.size(); i++) { @@ -79,10 +79,13 @@ void ListCtrlPanel::Update ( const StackEntryArray &stackArr ) m_dvListCtrl->AppendItem( cols, (wxUIntPtr)new StackEntry(entry) ); if ( isactive ) { - wxDataViewItem item = m_dvListCtrl->RowToItem(i); - if ( item.IsOk() ) { - m_dvListCtrl->EnsureVisible( item ); - } + activeFrame = i; + } + } + if ( activeFrame != wxNOT_FOUND ) { + wxDataViewItem item = m_dvListCtrl->RowToItem(activeFrame); + if ( item.IsOk() ) { + m_dvListCtrl->EnsureVisible( item ); } } } ----------------------------------------------------------------------- Summary of changes: LiteEditor.workspace | 4 ++-- LiteEditor/DebuggerSettings.wxcp | 2 +- LiteEditor/debuggersettingsbasedlg.cpp | 17 +++++++++-------- LiteEditor/debuggersettingsbasedlg.h | 1 + LiteEditor/listctrlpanel.cpp | 13 ++++++++----- 5 files changed, 21 insertions(+), 16 deletions(-) hooks/post-receive -- codelite |