Menu
▾
▴
codelite-git — Commit logs
You can subscribe to this list here.
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(40) |
May
(42) |
Jun
(47) |
Jul
(60) |
Aug
(55) |
Sep
(83) |
Oct
(78) |
Nov
(40) |
Dec
(106) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2014 |
Jan
(65) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eran I. <no...@so...> - 2013-04-17 10:20:01
|
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 dfbcfa5c1f252732740e1982f45a1e9f9529ddc7 (commit)
via abc787938248bd35facce489d6fb8be5f5052828 (commit)
from 6314ff40c1323d11401eaf3cf61d163322da6b6b (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/dfbcfa5c1f252732740e1982f45a1e9f9529ddc7
commit dfbcfa5c1f252732740e1982f45a1e9f9529ddc7
Author: Eran <era...@gm...>
Date: Wed Apr 17 13:19:51 2013 +0300
Minor update to the wxAUI toolbar drawing (changed colours)
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 7fc5b49..7c99987 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -40,7 +40,7 @@
<![CDATA[]]>
</Environment>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -102,7 +102,7 @@
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Unix_Custom_Makefile" Selected="no">
+ <WorkspaceConfiguration Name="Unix_Custom_Makefile" Selected="yes">
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
<Project Name="CallGraph" ConfigName="DebugUnicode"/>
<Project Name="CodeFormatter" ConfigName="WinDebugUnicode"/>
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 0450397..710240f 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -223,7 +223,7 @@ void clAuiDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wx
void clAuiDockArt::DrawSash(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect)
{
// dark theme
-#if defined(__WXMAC__) || defined (__WXGTK__)
+#if defined(__WXMAC__)
wxAuiDefaultDockArt::DrawSash(dc, window, orientation, rect);
return;
#endif
diff --git a/Plugin/cl_aui_tb_are.cpp b/Plugin/cl_aui_tb_are.cpp
index 1627e4a..e6bfc49 100644
--- a/Plugin/cl_aui_tb_are.cpp
+++ b/Plugin/cl_aui_tb_are.cpp
@@ -28,26 +28,36 @@ CLMainAuiTBArt::~CLMainAuiTBArt()
void CLMainAuiTBArt::DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect)
{
wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
- wxColour penColour;
+ wxColour borderUp, borderDown;
// Determine the pen colour
if ( !DrawingUtils::IsDark(bgColour)) {
- wxAuiDefaultToolBarArt::DrawBackground(dc, wnd, rect);
- return;
+ bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ borderUp = *wxWHITE;
+ borderDown = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
} else {
- penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ borderUp = DrawingUtils::LightColour(bgColour, 1.0);
+ borderDown = DrawingUtils::DarkColour(bgColour, 1.0);
}
// Now set the bg colour. It must be done after setting
// the pen colour
wxColour bgColour2 = bgColour;
- bgColour = DrawingUtils::LightColour(bgColour, 3.0);
+ bgColour = DrawingUtils::DarkColour(bgColour, 2.0);
dc.SetPen(bgColour);
dc.SetBrush(bgColour);
dc.DrawRectangle(rect);
- dc.GradientFillLinear(rect, bgColour2, bgColour, wxNORTH);
+ dc.GradientFillLinear(rect, bgColour2, bgColour, wxSOUTH);
+
+ dc.SetPen(borderUp);
+ dc.DrawLine(rect.GetLeftBottom(), rect.GetLeftTop());
+ dc.DrawLine(rect.GetTopLeft(), rect.GetTopRight());
+
+ dc.SetPen(borderDown);
+ dc.DrawLine(rect.GetTopRight(), rect.GetBottomRight());
+ dc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight());
}
void CLMainAuiTBArt::DrawGripper(wxDC& dc, wxWindow* wnd, const wxRect& rect)
https://sourceforge.net/p/codelite/codelitegit/ci/abc787938248bd35facce489d6fb8be5f5052828
commit abc787938248bd35facce489d6fb8be5f5052828
Author: Eran <era...@gm...>
Date: Wed Apr 17 10:54:54 2013 +0300
Removed CXX/CC custom code from CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e01ee9..616b829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,15 +76,15 @@ endif (UNIX)
########################################
## Support clang code completion
########################################
-if(DEFINED ENV{CXX})
- message("-- Using CXX $ENV{CXX}")
- set(CMAKE_CXX_COMPILER $ENV{CXX} )
-endif()
-
-if(DEFINED ENV{CC})
- message("-- Using CC $ENV{CC}")
- set(CMAKE_CC_COMPILER $ENV{CC} )
-endif()
+##if(DEFINED ENV{CXX})
+## message("-- Using CXX $ENV{CXX}")
+## set(CMAKE_CXX_COMPILER $ENV{CXX} )
+##endif()
+##
+##if(DEFINED ENV{CC})
+## message("-- Using CC $ENV{CC}")
+## set(CMAKE_CC_COMPILER $ENV{CC} )
+##endif()
########################################
## Override defaults with user input
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 18 +++++++++---------
LiteEditor.workspace | 4 ++--
Plugin/cl_aui_dock_art.cpp | 2 +-
Plugin/cl_aui_tb_are.cpp | 22 ++++++++++++++++------
4 files changed, 28 insertions(+), 18 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-17 06:27:28
|
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 6314ff40c1323d11401eaf3cf61d163322da6b6b (commit)
from 98870f266b576f51bdca7b6607d8e44f38e77d1a (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/6314ff40c1323d11401eaf3cf61d163322da6b6b
commit 6314ff40c1323d11401eaf3cf61d163322da6b6b
Author: eran <era...@gm...>
Date: Wed Apr 17 09:27:15 2013 +0300
Further updates to the looknfeel
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 40c642d..eeb7173 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -846,7 +846,7 @@ void clMainFrame::CreateGUIControls(void)
WorkspaceST::Get()->SetStartupDir(ManagerST::Get()->GetStarupDirectory());
m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE, 0);
- m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_SASH_SIZE, 4);
+ m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_SASH_SIZE, 6);
// Load the menubar from XRC and set this frame's menubar to it.
wxMenuBar *mb = wxXmlResource::Get()->LoadMenuBar(wxT("main_menu"));
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index c2c9623..0450397 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -3,6 +3,7 @@
#include <wx/dcmemory.h>
#include <wx/settings.h>
#include <editor_config.h>
+#include "globals.h"
// --------------------------------------------
@@ -197,9 +198,8 @@ void clAuiDockArt::DrawBackground(wxDC& dc, wxWindow* window, int orientation, c
}
dc.SetPen(bgColour);
- dc.SetBrush(bgColour);
+ dc.SetBrush( bgColour );
dc.DrawRectangle(rect);
- dc.SetPen(penColour);
}
void clAuiDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wxAuiPaneInfo& pane)
@@ -214,7 +214,7 @@ void clAuiDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wx
}
penColour = DrawingUtils::LightColour(bgColour, 4.0);
- dc.SetPen(penColour);
+ dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
@@ -222,22 +222,19 @@ void clAuiDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wx
void clAuiDockArt::DrawSash(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect)
{
- wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
- if ( !DrawingUtils::IsDark(bgColour) ) {
- wxAuiDefaultDockArt::DrawSash(dc, window, orientation, rect);
- return;
- }
-
// dark theme
#if defined(__WXMAC__) || defined (__WXGTK__)
wxAuiDefaultDockArt::DrawSash(dc, window, orientation, rect);
return;
#endif
-
+
+ // Prepare a stipple bitmap
+ wxColour bgColour = ::GetAUIPaneBGColour();
+
// MSW
wxUnusedVar(window);
wxUnusedVar(orientation);
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(bgColour);
+ dc.SetBrush( ::GetAUIStippleBrush() );
dc.DrawRectangle(rect);
}
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 02d48cd..8a51b11 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -4,6 +4,7 @@
#include "plugin_general_wxcp.h"
#include <wx/dcmemory.h>
#include <editor_config.h>
+#include "globals.h"
#ifdef __WXMSW__
# include <wx/msw/uxtheme.h>
@@ -284,14 +285,10 @@ void clAuiTabArt::DrawBackground(wxDC& dc,
// Now set the bg colour. It must be done after setting
// the pen colour
- if ( !DrawingUtils::IsDark(bgColour) ) {
- bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- } else {
- bgColour = DrawingUtils::LightColour(bgColour, 3.0);
- }
+ bgColour = ::GetAUIPaneBGColour();
gdc.SetPen(bgColour);
- gdc.SetBrush(bgColour);
+ gdc.SetBrush( ::GetAUIStippleBrush() );
gdc.DrawRectangle(rect);
gdc.SetPen(penColour);
gdc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight());
diff --git a/Plugin/globals.cpp b/Plugin/globals.cpp
index 4bd41c9..f436eb0 100644
--- a/Plugin/globals.cpp
+++ b/Plugin/globals.cpp
@@ -60,6 +60,9 @@
#include "project.h"
#include <wx/icon.h>
#include <wx/dataview.h>
+#include "drawingutils.h"
+#include <wx/settings.h>
+#include <wx/dcmemory.h>
#ifdef __WXMSW__
#include <Uxtheme.h>
@@ -1494,3 +1497,41 @@ void PostCall(wxObject* instance, clEventFunc_t func)
evt.SetClientObject( cd );
EventNotifier::Get()->AddPendingEvent( evt );
}
+
+wxColour GetAUIPaneBGColour()
+{
+ // Now set the bg colour. It must be done after setting
+ // the pen colour
+ wxColour bgColour = EditorConfigST::Get()->GetCurrentOutputviewBgColour();
+ if ( !DrawingUtils::IsDark(bgColour) ) {
+ bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ } else {
+ bgColour = DrawingUtils::LightColour(bgColour, 3.0);
+ }
+ return bgColour;
+}
+
+wxBrush GetAUIStippleBrush()
+{
+ wxMemoryDC memDC;
+ wxColour bgColour = ::GetAUIPaneBGColour();
+ wxBitmap bmpStipple(3, 3);
+ wxColour lightPen = DrawingUtils::DarkColour(bgColour, 1.0);
+ wxColour darkPen = DrawingUtils::LightColour(bgColour, 1.0);
+ memDC.SelectObject(bmpStipple);
+ memDC.SetBrush( bgColour );
+ memDC.SetPen( bgColour );
+ memDC.DrawRectangle(wxPoint(0,0), bmpStipple.GetSize());
+
+ /// Draw all the light points, we have 3 of them
+ memDC.SetPen(lightPen);
+ memDC.DrawPoint(0, 2);
+ memDC.DrawPoint(2, 0);
+
+ /// and 2 dark points
+ memDC.SetPen(darkPen);
+ memDC.DrawPoint(0, 1);
+
+ memDC.SelectObject(wxNullBitmap);
+ return wxBrush(bmpStipple);
+}
\ No newline at end of file
diff --git a/Plugin/globals.h b/Plugin/globals.h
index 8983409..610197b 100644
--- a/Plugin/globals.h
+++ b/Plugin/globals.h
@@ -34,6 +34,7 @@
#include "workspace.h"
#include <wx/variant.h>
#include <wx/bitmap.h>
+#include <wx/brush.h>
class wxListCtrl;
class IEditor;
@@ -382,4 +383,7 @@ WXDLLIMPEXP_SDK wxVariant MakeIconText(const wxString& text, const wxBitmap& bmp
WXDLLIMPEXP_SDK void PostCall(wxObject *instance, clEventFunc_t func, wxObject* arg);
WXDLLIMPEXP_SDK void PostCall(wxObject *instance, clEventFunc_t func);
+WXDLLIMPEXP_SDK wxColour GetAUIPaneBGColour();
+WXDLLIMPEXP_SDK wxBrush GetAUIStippleBrush();
+
#endif //GLOBALS_H
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/frame.cpp | 2 +-
Plugin/cl_aui_dock_art.cpp | 19 +++++++----------
Plugin/cl_aui_notebook_art.cpp | 9 ++-----
Plugin/globals.cpp | 41 ++++++++++++++++++++++++++++++++++++++++
Plugin/globals.h | 4 +++
5 files changed, 57 insertions(+), 18 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-17 05:25:01
|
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 98870f266b576f51bdca7b6607d8e44f38e77d1a (commit)
from 101b11846c63100e6fb33f8d6c4f034dd431acc7 (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/98870f266b576f51bdca7b6607d8e44f38e77d1a
commit 98870f266b576f51bdca7b6607d8e44f38e77d1a
Author: eran <era...@gm...>
Date: Wed Apr 17 08:24:43 2013 +0300
GDB Pretty printers: disabled the 'wxFileName' printer for Windows
diff --git a/LiteEditor/WelcomePage.cpp b/LiteEditor/WelcomePage.cpp
index e00e8d8..60b63e0 100644
--- a/LiteEditor/WelcomePage.cpp
+++ b/LiteEditor/WelcomePage.cpp
@@ -6,14 +6,19 @@
#include "fileextmanager.h"
#include "window_locker.h"
#include <wx/clntdata.h>
+#include "event_notifier.h"
+#include "plugin.h"
+#include "editor_config.h"
WelcomePage::WelcomePage(wxWindow* parent)
: WelcomePageBase(parent)
{
+ EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(WelcomePage::OnThemeChanged), NULL, this);
}
WelcomePage::~WelcomePage()
{
+ EventNotifier::Get()->Disconnect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(WelcomePage::OnThemeChanged), NULL, this);
}
void WelcomePage::OnNewProject(wxCommandEvent& event)
@@ -145,3 +150,14 @@ void WelcomePage::OnRecentProjectUI(wxUpdateUIEvent& event)
ManagerST::Get()->GetRecentlyOpenedWorkspaces(files);
event.Enable( !files.IsEmpty() );
}
+
+void WelcomePage::OnThemeChanged(wxCommandEvent& e)
+{
+ e.Skip();
+ //wxColour bgColour = EditorConfigST::Get()->GetCurrentOutputviewBgColour();
+ //wxColour fgColour = EditorConfigST::Get()->GetCurrentOutputviewFgColour();
+ //
+ //SetBackgroundColour( bgColour );
+ //SetForegroundColour( fgColour );
+ //Refresh();
+}
diff --git a/LiteEditor/WelcomePage.h b/LiteEditor/WelcomePage.h
index f493293..3f149ea 100644
--- a/LiteEditor/WelcomePage.h
+++ b/LiteEditor/WelcomePage.h
@@ -24,5 +24,6 @@ protected:
virtual void OnNewProject(wxCommandEvent& event);
virtual void OnOpenForums(wxCommandEvent& event);
virtual void OnOpenWiki(wxCommandEvent& event);
+ void OnThemeChanged(wxCommandEvent &e);
};
#endif // WELCOMEPAGE_H
diff --git a/Runtime/gdb_printers/wx.py b/Runtime/gdb_printers/wx.py
index a45626d..a516599 100644
--- a/Runtime/gdb_printers/wx.py
+++ b/Runtime/gdb_printers/wx.py
@@ -2,6 +2,7 @@
import gdb
import itertools
import re
+import platform
class wxStringPrinter:
@@ -142,7 +143,8 @@ def lookup_function (val):
def build_dictionary ():
pretty_printers_dict[re.compile('^wxString$')] = lambda val: wxStringPrinter(val)
pretty_printers_dict[re.compile('^wxArray.+$')] = lambda val: wxArrayFooPrinter(val)
- pretty_printers_dict[re.compile('^wxFileName$')] = lambda val: wxFileNamePrinter(val)
+ if platform.system() != 'Windows':
+ pretty_printers_dict[re.compile('^wxFileName$')] = lambda val: wxFileNamePrinter(val)
pretty_printers_dict[re.compile('^wxPoint$')] = lambda val: wxPointPrinter(val)
pretty_printers_dict[re.compile('^wxSize$')] = lambda val: wxSizePrinter(val)
pretty_printers_dict[re.compile('^wxRect$')] = lambda val: wxRectPrinter(val)
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/WelcomePage.cpp | 16 ++++++++++++++++
LiteEditor/WelcomePage.h | 1 +
Runtime/gdb_printers/wx.py | 4 +++-
3 files changed, 20 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-16 14:45:04
|
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 101b11846c63100e6fb33f8d6c4f034dd431acc7 (commit)
from 03c9193d1d0c90ceefe65ddbde8fce651cd0b1d7 (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/101b11846c63100e6fb33f8d6c4f034dd431acc7
commit 101b11846c63100e6fb33f8d6c4f034dd431acc7
Author: eran <era...@gm...>
Date: Tue Apr 16 17:44:45 2013 +0300
Debugger output now supports theme changes
diff --git a/LiteEditor/debuggerasciiviewer.cpp b/LiteEditor/debuggerasciiviewer.cpp
index 724531e..3867460 100644
--- a/LiteEditor/debuggerasciiviewer.cpp
+++ b/LiteEditor/debuggerasciiviewer.cpp
@@ -3,6 +3,10 @@
#include "debuggerpane.h"
#include "manager.h"
#include "debugger.h"
+#include <event_notifier.h>
+#include <plugin.h>
+#include <lexer_configuration.h>
+#include <editor_config.h>
static void sDefineMarker(wxStyledTextCtrl *s, int marker, int markerType, wxColor fore, wxColor back)
{
@@ -14,42 +18,52 @@ static void sDefineMarker(wxStyledTextCtrl *s, int marker, int markerType, wxCol
DebuggerAsciiViewer::DebuggerAsciiViewer( wxWindow* parent )
: DebuggerAsciiViewerBase( parent )
{
- wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
-
- // hide all margins
- m_textView->SetMarginWidth(0, 0);
- m_textView->SetMarginWidth(1, 0);
- m_textView->SetMarginWidth(2, 0);
- m_textView->SetMarginWidth(3, 0);
- m_textView->SetMarginWidth(4, 0);
-
- m_textView->SetMarginSensitive(4, true);
- m_textView->SetProperty(wxT("fold"), wxT("1"));
-
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNER, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUSCONNECTED, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
- sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
-
- // set wrapped line indicator
- m_textView->SetWrapVisualFlags(1);
- m_textView->SetWrapStartIndent(4);
- m_textView->SetScrollWidthTracking(true);
- m_textView->StyleSetForeground(wxSTC_STYLE_DEFAULT, wxT("GREY"));
-
- // Set wrap mode on
- m_textView->SetWrapMode(wxSTC_WRAP_WORD);
- // Use NULL lexer
- m_textView->SetLexer(wxSTC_LEX_CPP);
- m_textView->SetMarginMask(4, wxSTC_MASK_FOLDERS);
-
- // Set TELETYPE font (monospace)
- m_textView->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
- m_textView->StyleSetSize(wxSTC_STYLE_DEFAULT, 12 );
-
+ EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(DebuggerAsciiViewer::OnThemeColourChanged), NULL, this);
+ LexerConfPtr cpp_lexer = EditorConfigST::Get()->GetLexer("C++");
+ if ( cpp_lexer ) {
+ cpp_lexer->Apply( m_textView );
+ m_textView->SetLexer(wxSTC_LEX_CPP);
+
+ } else {
+ // This code should not be called at all...
+ // but still - just in case
+ wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+
+ // hide all margins
+ m_textView->SetMarginWidth(0, 0);
+ m_textView->SetMarginWidth(1, 0);
+ m_textView->SetMarginWidth(2, 0);
+ m_textView->SetMarginWidth(3, 0);
+ m_textView->SetMarginWidth(4, 0);
+
+ m_textView->SetMarginSensitive(4, true);
+ m_textView->SetProperty(wxT("fold"), wxT("1"));
+
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNER, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUSCONNECTED, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+ sDefineMarker(m_textView, wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER, wxColor(0xff, 0xff, 0xff), wxColor(0x80, 0x80, 0x80));
+
+ // set wrapped line indicator
+ m_textView->SetWrapVisualFlags(1);
+ m_textView->SetWrapStartIndent(4);
+ m_textView->SetScrollWidthTracking(true);
+ m_textView->StyleSetForeground(wxSTC_STYLE_DEFAULT, wxT("GREY"));
+
+ // Set wrap mode on
+ m_textView->SetWrapMode(wxSTC_WRAP_WORD);
+ // Use NULL lexer
+ m_textView->SetLexer(wxSTC_LEX_CPP);
+ m_textView->SetMarginMask(4, wxSTC_MASK_FOLDERS);
+
+ // Set TELETYPE font (monospace)
+ m_textView->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
+ m_textView->StyleSetSize(wxSTC_STYLE_DEFAULT, 12 );
+ }
+
m_textView->SetReadOnly(true);
wxTheApp->Connect(wxID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(DebuggerAsciiViewer::OnEdit), NULL, this);
@@ -131,4 +145,16 @@ DebuggerAsciiViewer::~DebuggerAsciiViewer()
wxTheApp->Disconnect(wxID_SELECTALL, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(DebuggerAsciiViewer::OnEdit), NULL, this);
wxTheApp->Disconnect(wxID_COPY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(DebuggerAsciiViewer::OnEditUI), NULL, this);
wxTheApp->Disconnect(wxID_SELECTALL, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(DebuggerAsciiViewer::OnEditUI), NULL, this);
+ EventNotifier::Get()->Disconnect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(DebuggerAsciiViewer::OnThemeColourChanged), NULL, this);
}
+
+void DebuggerAsciiViewer::OnThemeColourChanged(wxCommandEvent& e)
+{
+ e.Skip();
+
+ // Re-apply C++ lexer
+ LexerConfPtr cpp_lexer = EditorConfigST::Get()->GetLexer("C++");
+ if ( cpp_lexer ) {
+ cpp_lexer->Apply( m_textView );
+ }
+}
diff --git a/LiteEditor/debuggerasciiviewer.h b/LiteEditor/debuggerasciiviewer.h
index 8d4a3c4..775bac7 100644
--- a/LiteEditor/debuggerasciiviewer.h
+++ b/LiteEditor/debuggerasciiviewer.h
@@ -13,16 +13,16 @@ class IDebugger;
/** Implementing DebuggerAsciiViewerBase */
class DebuggerAsciiViewer : public DebuggerAsciiViewerBase
{
- void OnClearView(wxCommandEvent &e);
- void OnEdit (wxCommandEvent &e);
- void OnEditUI(wxUpdateUIEvent &e);
-
- bool IsFocused();
+ void OnClearView(wxCommandEvent &e);
+ void OnEdit (wxCommandEvent &e);
+ void OnEditUI(wxUpdateUIEvent &e);
+ void OnThemeColourChanged(wxCommandEvent &e);
+ bool IsFocused();
public:
- /** Constructor */
- DebuggerAsciiViewer( wxWindow* parent );
- virtual ~DebuggerAsciiViewer();
- void UpdateView (const wxString &expr, const wxString &value);
+ /** Constructor */
+ DebuggerAsciiViewer( wxWindow* parent );
+ virtual ~DebuggerAsciiViewer();
+ void UpdateView (const wxString &expr, const wxString &value);
};
#endif // __debuggerasciiviewer__
diff --git a/LiteEditor/simpletablebase.cpp b/LiteEditor/simpletablebase.cpp
index ad5af31..2c377e8 100644
--- a/LiteEditor/simpletablebase.cpp
+++ b/LiteEditor/simpletablebase.cpp
@@ -9,6 +9,10 @@
#include "manager.h"
#include "debugger.h"
#include "globals.h"
+#include "event_notifier.h"
+#include "plugin.h"
+#include "editor_config.h"
+
///////////////////////////////////////////////////////////////////////////
DebuggerTreeListCtrlBase::DebuggerTreeListCtrlBase( wxWindow* parent,
@@ -55,7 +59,9 @@ DebuggerTreeListCtrlBase::DebuggerTreeListCtrlBase( wxWindow* parent,
this->SetSizer( bSizer1 );
this->Layout();
-
+
+ EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(DebuggerTreeListCtrlBase::OnThemeColourChanged), NULL, this);
+
// Connect Events
m_listTable->Connect( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEventHandler( DebuggerTreeListCtrlBase::OnListEditLabelBegin ), NULL, this );
m_listTable->Connect( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEventHandler( DebuggerTreeListCtrlBase::OnListEditLabelEnd ), NULL, this );
@@ -79,6 +85,7 @@ DebuggerTreeListCtrlBase::DebuggerTreeListCtrlBase( wxWindow* parent,
DebuggerTreeListCtrlBase::~DebuggerTreeListCtrlBase()
{
// Disconnect Events
+ EventNotifier::Get()->Disconnect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(DebuggerTreeListCtrlBase::OnThemeColourChanged), NULL, this);
m_listTable->Disconnect( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEventHandler( DebuggerTreeListCtrlBase::OnListEditLabelBegin ), NULL, this );
m_listTable->Disconnect( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEventHandler( DebuggerTreeListCtrlBase::OnListEditLabelEnd ), NULL, this );
m_listTable->Disconnect( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler( DebuggerTreeListCtrlBase::OnItemRightClick ), NULL, this );
@@ -109,6 +116,9 @@ IDebugger* DebuggerTreeListCtrlBase::DoGetDebugger()
void DebuggerTreeListCtrlBase::DoResetItemColour(const wxTreeItemId& item, size_t itemKind)
{
+ wxColour bgColour = EditorConfigST::Get()->GetCurrentOutputviewBgColour();
+ wxColour fgColour = EditorConfigST::Get()->GetCurrentOutputviewFgColour();
+
wxTreeItemIdValue cookieOne;
wxTreeItemId child = m_listTable->GetFirstChild(item, cookieOne);
while( child.IsOk() ) {
@@ -116,10 +126,10 @@ void DebuggerTreeListCtrlBase::DoResetItemColour(const wxTreeItemId& item, size_
bool resetColor = ((itemKind == 0) || (data && (data->_kind & itemKind)));
if(resetColor) {
- m_listTable->SetItemTextColour(child, DrawingUtils::GetOutputPaneFgColour());
+ m_listTable->SetItemTextColour(child, fgColour);
}
- m_listTable->SetItemBackgroundColour(child, DrawingUtils::GetOutputPaneBgColour());
+ m_listTable->SetItemBackgroundColour(child, bgColour);
if(m_listTable->HasChildren(child)) {
DoResetItemColour(child, itemKind);
@@ -375,3 +385,18 @@ void DebuggerTreeListCtrlBase::UpdateVariableObjects()
item = m_listTable->GetNextChild(root, cookieOne);
}
}
+
+void DebuggerTreeListCtrlBase::OnThemeColourChanged(wxCommandEvent& e)
+{
+ e.Skip();
+ wxColour bgColour = EditorConfigST::Get()->GetCurrentOutputviewBgColour();
+ wxColour fgColour = EditorConfigST::Get()->GetCurrentOutputviewFgColour();
+
+ m_listTable->SetBackgroundColour(bgColour);
+ m_listTable->SetForegroundColour(fgColour);
+
+ SetBackgroundColour(bgColour);
+ SetForegroundColour(fgColour);
+
+ Refresh();
+}
diff --git a/LiteEditor/simpletablebase.h b/LiteEditor/simpletablebase.h
index 5978f4d..0e35643 100644
--- a/LiteEditor/simpletablebase.h
+++ b/LiteEditor/simpletablebase.h
@@ -118,7 +118,9 @@ protected:
virtual void OnRefreshUI( wxUpdateUIEvent& event ) {
event.Skip();
}
-
+
+ void OnThemeColourChanged(wxCommandEvent &e);
+
public:
DebuggerTreeListCtrlBase( wxWindow* parent,
wxWindowID id = wxID_ANY,
@@ -145,6 +147,7 @@ public:
virtual void ResetTableColors ();
virtual wxString GetItemPath (const wxTreeItemId &item);
virtual void UpdateVariableObjects ();
+
};
#endif //__simpletablebase__
diff --git a/LiteEditor/theme_handler.cpp b/LiteEditor/theme_handler.cpp
index 1f6cf20..5b7d115 100644
--- a/LiteEditor/theme_handler.cpp
+++ b/LiteEditor/theme_handler.cpp
@@ -7,17 +7,21 @@
#include <wx/listbox.h>
#include "wxcl_log_text_ctrl.h"
#include <wx/listctrl.h>
+#include <wx/aui/framemanager.h>
+#include "cl_aui_tb_are.h"
#define CHECK_POINTER(p) if ( !p ) return;
ThemeHandler::ThemeHandler()
{
EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(ThemeHandler::OnEditorThemeChanged), NULL, this);
+ EventNotifier::Get()->Connect(wxEVT_INIT_DONE, wxCommandEventHandler(ThemeHandler::OnInitDone), NULL, this);
}
ThemeHandler::~ThemeHandler()
{
EventNotifier::Get()->Disconnect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(ThemeHandler::OnEditorThemeChanged), NULL, this);
+ EventNotifier::Get()->Disconnect(wxEVT_INIT_DONE, wxCommandEventHandler(ThemeHandler::OnInitDone), NULL, this);
}
void ThemeHandler::OnEditorThemeChanged(wxCommandEvent& e)
@@ -48,10 +52,23 @@ void ThemeHandler::OnEditorThemeChanged(wxCommandEvent& e)
}
}
+ pageCount = clMainFrame::Get()->GetDebuggerPane()->GetNotebook()->GetPageCount();
+ for(size_t i=0; i<pageCount; ++i) {
+
+ wxWindow * page = clMainFrame::Get()->GetDebuggerPane()->GetNotebook()->GetPage(i);
+ if ( page ) {
+ DoUpdateColours(page, bgColour, fgColour);
+ }
+ }
+
wxclTextCtrl *log = dynamic_cast<wxclTextCtrl*>( wxLog::GetActiveTarget() );
if ( log ) {
log->Reset();
}
+
+ /// go over all the aui-toolbars and make sure they all have
+ /// our custom aui artproivder
+ DoUpdateAuiToolBars(clMainFrame::Get());
}
void ThemeHandler::DoUpdateColours(wxWindow* win, const wxColour& bg, const wxColour& fg)
@@ -78,3 +95,56 @@ void ThemeHandler::DoUpdateSTCBgColour(wxStyledTextCtrl* stc)
}
stc->Refresh();
}
+
+void ThemeHandler::OnInitDone(wxCommandEvent& e)
+{
+ e.Skip();
+ // Load all wxAuiToolBars and make sure they all have our custom wxAuiTabArt (which supports dark theme)
+ wxAuiManager &aui = clMainFrame::Get()->GetDockingManager();
+ wxAuiPaneInfoArray& allPanes = aui.GetAllPanes();
+ for(size_t i=0; i<allPanes.GetCount(); ++i) {
+ if ( allPanes.Item(i).IsToolbar() ) {
+ wxAuiPaneInfo &pane = allPanes.Item(i);
+ wxAuiToolBar *auibar = dynamic_cast<wxAuiToolBar*>(pane.window);
+ if( auibar ) {
+ CLMainAuiTBArt *clArtProvider = dynamic_cast<CLMainAuiTBArt*>(auibar->GetArtProvider());
+ if ( !clArtProvider ) {
+ /// not codelite's custom art provider
+ /// replace it
+ auibar->SetArtProvider( new CLMainAuiTBArt() );
+ }
+ }
+ }
+ }
+ aui.Update();
+}
+
+void ThemeHandler::DoUpdateAuiToolBars(wxWindow* win)
+{
+ bool bDarkBG = DrawingUtils::IsDark(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+
+ wxAuiToolBar *auibar = dynamic_cast<wxAuiToolBar*>( win );
+ if( auibar ) {
+ CLMainAuiTBArt *clArtProvider = dynamic_cast<CLMainAuiTBArt*>(auibar->GetArtProvider());
+ if ( !clArtProvider ) {
+ /// not codelite's custom art provider
+ /// replace it
+ auibar->SetArtProvider( new CLMainAuiTBArt() );
+ }
+ size_t toolCount = auibar->GetToolCount();
+ for(size_t i=0; i<toolCount; i++) {
+ wxAuiToolBarItem* tool = auibar->FindToolByIndex(i);
+ if ( tool->GetKind() == wxITEM_NORMAL || tool->GetKind() == wxITEM_CHECK || tool->GetKind() == wxITEM_DROPDOWN || tool->GetKind() == wxITEM_RADIO ) {
+ tool->SetDisabledBitmap( tool->GetBitmap().ConvertToDisabled(bDarkBG ? 50 : 255) );
+ }
+ }
+ auibar->Refresh();
+ }
+
+ wxWindowList::compatibility_iterator pclNode = win->GetChildren().GetFirst();
+ while(pclNode) {
+ wxWindow* pclChild = pclNode->GetData();
+ this->DoUpdateAuiToolBars(pclChild);
+ pclNode = pclNode->GetNext();
+ }
+}
diff --git a/LiteEditor/theme_handler.h b/LiteEditor/theme_handler.h
index adc0cde..0e40fe1 100644
--- a/LiteEditor/theme_handler.h
+++ b/LiteEditor/theme_handler.h
@@ -8,6 +8,7 @@
class ThemeHandler : public wxEvtHandler
{
void DoUpdateColours( wxWindow* win, const wxColour& bg, const wxColour &fg );
+ void DoUpdateAuiToolBars( wxWindow* win );
void DoUpdateSTCBgColour(wxStyledTextCtrl *stc);
public:
@@ -15,6 +16,7 @@ public:
virtual ~ThemeHandler();
void OnEditorThemeChanged(wxCommandEvent &e);
+ void OnInitDone(wxCommandEvent &e);
};
#endif // THEMEHANDLER_H
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/debuggerasciiviewer.cpp | 98 +++++++++++++++++++++++-------------
LiteEditor/debuggerasciiviewer.h | 18 +++---
LiteEditor/simpletablebase.cpp | 31 ++++++++++-
LiteEditor/simpletablebase.h | 5 ++-
LiteEditor/theme_handler.cpp | 70 +++++++++++++++++++++++++
LiteEditor/theme_handler.h | 2 +
6 files changed, 175 insertions(+), 49 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-16 07:45:34
|
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 03c9193d1d0c90ceefe65ddbde8fce651cd0b1d7 (commit)
from ee7d85ce7e20c67c1014feda0f37c5f8ef5deed4 (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/03c9193d1d0c90ceefe65ddbde8fce651cd0b1d7
commit 03c9193d1d0c90ceefe65ddbde8fce651cd0b1d7
Author: eran <era...@gm...>
Date: Tue Apr 16 10:45:04 2013 +0300
- Migrated Project Settings dialog to wxCrafter
- Fixed: https://sourceforge.net/p/codelite/bugs/871/ (the debugger path is now kept relative), in addition, it also supports codelite's macros in the debugger path field
- More updates to make the dark theme better
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 80e55f7..932e387 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -524,6 +524,7 @@
<File Name="../InnoSetup/codelite_mingw.iss"/>
<File Name="../InnoSetup/codelite_mingw_wx.iss"/>
<File Name="../codelite-icons-fresh-farm/manifest.ini"/>
+ <File Name="project_settings.wxcp"/>
</VirtualDirectory>
<VirtualDirectory Name="Docking Windows">
<File Name="output_pane.cpp"/>
@@ -779,6 +780,7 @@
<File Name="newquickwatch_liteeditor_bitmaps.cpp"/>
<File Name="listctrlpanel_formbuilder_bitmaps.cpp"/>
<File Name="DebuggerSettingsBaseDlg_liteeditor_bitmaps.cpp"/>
+ <File Name="project_settings_liteeditor_bitmaps.cpp"/>
</VirtualDirectory>
<File Name="../formbuilder/editorsettingslocalbase.wxcp"/>
<File Name="../formbuilder/findinfiles_dlg.wxcp"/>
@@ -1071,8 +1073,7 @@ LD_LIBRARY_PATH=/home/eran/root/lib/codelite/]]>
<CustomPostBuild/>
<CustomPreBuild>resources.cpp
resources.cpp: resources.xrc
- wxrc -c -v -o resources.cpp resources.xrc
-</CustomPreBuild>
+ wxrc -c -v -o resources.cpp resources.xrc</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="no">
<ClangCmpFlagsC/>
@@ -1157,7 +1158,7 @@ resources.cpp: resources.xrc
<Library Value="liblibclang.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="yes"/>
- <General OutputFile="$(IntermediateDirectory)/codelite.exe" IntermediateDirectory="./Debug" Command="./codelite.exe" CommandArguments="-b . " UseSeparateDebugArgs="yes" DebugArguments="-b . " WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite.exe" IntermediateDirectory="./Debug" Command="./codelite.exe" CommandArguments="-b . " UseSeparateDebugArgs="yes" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no"/>
<Environment EnvVarSetName="Default" DbgSetName="">
<![CDATA[PATH=../sdk/clang/lib;$(WXWIN)\lib\gcc_dll;$(PATH)]]>
</Environment>
@@ -1188,7 +1189,8 @@ resources.cpp: resources.xrc
wxrc /c /v /o resources.cpp resources.xrc
svninfo.cpp:
- autorev .</CustomPreBuild>
+ autorev .
+</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="no">
<ClangCmpFlagsC/>
diff --git a/LiteEditor/debuggerpane.cpp b/LiteEditor/debuggerpane.cpp
index 71fdaec..c59c6cd 100644
--- a/LiteEditor/debuggerpane.cpp
+++ b/LiteEditor/debuggerpane.cpp
@@ -101,7 +101,7 @@ void DebuggerPane::CreateGUIControls()
EditorConfigST::Get()->GetLongValue(wxT("DebuggerBook"), bookStyle);
m_book = new Notebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, bookStyle);
- mainSizer->Add(m_book, 1, wxEXPAND|wxALL, 1);
+ mainSizer->Add(m_book, 1, wxEXPAND|wxALL, 0);
// Calculate the widthest tab (the one with the 'Call Stack' label)
int xx, yy;
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 5097939..40c642d 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -845,7 +845,7 @@ void clMainFrame::CreateGUIControls(void)
DebuggerConfigTool::Get()->Load(wxT("config/debuggers.xml"), wxT("5.11"));
WorkspaceST::Get()->SetStartupDir(ManagerST::Get()->GetStarupDirectory());
- m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE, 1);
+ m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE, 0);
m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_SASH_SIZE, 4);
// Load the menubar from XRC and set this frame's menubar to it.
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 97b32b4..7d41b56 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -2133,6 +2133,20 @@ void Manager::DbgStart ( long attachPid )
wxString userDebuggr = bldConf->GetDebuggerPath();
userDebuggr.Trim().Trim ( false );
if ( userDebuggr.IsEmpty() == false ) {
+ // expand project macros
+ userDebuggr = MacroManager::Instance()->Expand(userDebuggr,
+ PluginManager::Get(),
+ proj->GetName(),
+ bldConf->GetName());
+
+ // Convert any relative path to absolute path
+ // see bug# https://sourceforge.net/p/codelite/bugs/871/
+ wxFileName fnDebuggerPath(userDebuggr);
+ if ( fnDebuggerPath.IsRelative() ) {
+ if ( fnDebuggerPath.MakeAbsolute(proj->GetFileName().GetPath()) ) {
+ userDebuggr = fnDebuggerPath.GetFullPath();
+ }
+ }
dinfo.path = userDebuggr;
}
}
@@ -2177,7 +2191,21 @@ void Manager::DbgStart ( long attachPid )
wxString userDebuggr = bldConf->GetDebuggerPath();
userDebuggr.Trim().Trim ( false );
if ( userDebuggr.IsEmpty() == false ) {
- dbginfo.path = userDebuggr;
+ // expand project macros
+ userDebuggr = MacroManager::Instance()->Expand(userDebuggr,
+ PluginManager::Get(),
+ proj->GetName(),
+ bldConf->GetName());
+
+ // Convert any relative path to absolute path
+ // see bug# https://sourceforge.net/p/codelite/bugs/871/
+ wxFileName fnDebuggerPath(userDebuggr);
+ if ( fnDebuggerPath.IsRelative() ) {
+ if ( fnDebuggerPath.MakeAbsolute(proj->GetFileName().GetPath()) ) {
+ userDebuggr = fnDebuggerPath.GetFullPath();
+ }
+ }
+ dinfo.path = userDebuggr;
}
}
diff --git a/LiteEditor/output_pane.cpp b/LiteEditor/output_pane.cpp
index 7b56fef..d7c19b4 100644
--- a/LiteEditor/output_pane.cpp
+++ b/LiteEditor/output_pane.cpp
@@ -83,7 +83,7 @@ void OutputPane::CreateGUIControls()
wxFont fnt = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
wxWindow::GetTextExtent(wxGetTranslation(REPLACE_IN_FILES), &xx, &yy, NULL, NULL, &fnt);
- mainSizer->Add(m_book, 1, wxEXPAND | wxALL | wxGROW, 1);
+ mainSizer->Add(m_book, 1, wxEXPAND | wxALL | wxGROW, 0);
#if CL_USE_NEW_BUILD_TAB
m_buildWin = new NewBuildTab(m_book);
diff --git a/LiteEditor/project_settings.wxcp b/LiteEditor/project_settings.wxcp
new file mode 100644
index 0000000..8751508
--- /dev/null
+++ b/LiteEditor/project_settings.wxcp
@@ -0,0 +1,14725 @@
+{
+ "metadata": {
+ "m_generatedFilesDir": ".",
+ "m_objCounter": 39,
+ "m_includeFiles": [],
+ "m_bitmapFunction": "wxCA3F0InitBitmapResources",
+ "m_bitmapsFile": "project_settings_liteeditor_bitmaps.cpp",
+ "m_GenerateCodeTypes": 1960351961,
+ "m_outputFileName": "project_settings_base_dlg.h",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
+ "m_templateClasses": [{
+ "m_includeFile": "#include <wx/treebook.h>",
+ "m_allocationLine": "m_treebook = new wxTreebook( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );",
+ "m_className": "wxTreebook",
+ "m_xrcPreviewClass": "wxNotebook",
+ "m_events": []
+ }]
+ },
+ "windows": [{
+ "m_type": 4421,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": ["wxDEFAULT_DIALOG_STYLE", "wxRESIZE_BORDER"],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "ProjectSettingsBaseDlg"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Title:",
+ "m_value": "Project Settings"
+ }, {
+ "type": "virtualFolderPicker",
+ "m_label": "Virtual Folder:",
+ "m_path": ""
+ }, {
+ "type": "choice",
+ "m_label": "Centre:",
+ "m_selection": 1,
+ "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"]
+ }, {
+ "type": "string",
+ "m_label": "File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Inherited Class",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Class Decorator",
+ "m_value": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "mainSizer"
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4408,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": ["wxTAB_TRAVERSAL"],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_panelSettings"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_sizerSettings"
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "bSizer44"
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 1,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4411,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceConfig"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnConfigurationChanged(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected."
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4465,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_treebook"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
... 40353 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 21:04:42
|
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 ee7d85ce7e20c67c1014feda0f37c5f8ef5deed4 (commit)
from dc958cd4bfaa84d216407df646110a1bc491d6ed (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/ee7d85ce7e20c67c1014feda0f37c5f8ef5deed4
commit ee7d85ce7e20c67c1014feda0f37c5f8ef5deed4
Author: eran <era...@gm...>
Date: Tue Apr 16 00:04:25 2013 +0300
Ctrl-M (View -> Toggle All Panes) now also hides the toolbars
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 51471b0..97b32b4 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -1565,53 +1565,27 @@ void Manager::HidePane ( const wxString &paneName, bool commit )
void Manager::TogglePanes()
{
- static bool toggled = false;
static wxString savedLayout;
-
- // list of panes to be toggled on and off
- static wxArrayString panes;
-
- if ( !toggled ) {
+ if ( savedLayout.IsEmpty() ) {
+
savedLayout = clMainFrame::Get()->GetDockingManager().SavePerspective();
- panes.Clear();
- // create the list of panes to be tested
- wxArrayString candidates;
- candidates.Add ( wxT("Output View") );
- candidates.Add ( wxT("Workspace View") );
- candidates.Add ( wxT("Debugger") );
-
- // add the detached tabs list
- wxArrayString dynamicPanes = clMainFrame::Get()->GetDockablePaneMenuManager()->GetDeatchedPanesList();
- for ( size_t i=0; i<dynamicPanes.GetCount(); i++ ) {
- candidates.Add ( dynamicPanes.Item ( i ) );
- }
-
- for ( size_t i=0; i<candidates.GetCount(); i++ ) {
- wxAuiPaneInfo info;
- info = clMainFrame::Get()->GetDockingManager().GetPane ( candidates.Item ( i ) );
- if ( info.IsOk() && info.IsShown() ) {
- panes.Add ( candidates.Item ( i ) );
+ wxAuiManager& aui = clMainFrame::Get()->GetDockingManager();
+ wxAuiPaneInfoArray &all_panes = aui.GetAllPanes();
+ for(size_t i=0; i<all_panes.GetCount(); ++i) {
+ if(all_panes.Item(i).IsOk() && all_panes.Item(i).IsShown() && all_panes.Item(i).dock_direction != wxAUI_DOCK_CENTER ) {
+ all_panes.Item(i).Hide();
}
}
-
-
- // hide the matched panes
- for ( size_t i=0; i<panes.GetCount(); i++ ) {
- HidePane ( panes.Item ( i ), false );
- }
-
+
//update changes
- clMainFrame::Get()->GetDockingManager().Update();
- toggled = true;
-
+ aui.Update();
+
} else {
clMainFrame::Get()->GetDockingManager().LoadPerspective(savedLayout);
- toggled = false;
savedLayout.Clear();
}
}
-
//--------------------------- Menu and Accelerator Mmgt -----------------------------
void Manager::UpdateMenuAccelerators()
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/manager.cpp | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 20:54:33
|
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 dc958cd4bfaa84d216407df646110a1bc491d6ed (commit)
from 5ba2354b3f09f4c38c82b85da22d4e38962362a8 (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/dc958cd4bfaa84d216407df646110a1bc491d6ed
commit dc958cd4bfaa84d216407df646110a1bc491d6ed
Author: eran <era...@gm...>
Date: Mon Apr 15 23:54:18 2013 +0300
Further UI updates to the tab look'n'feel
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 5b16260..02d48cd 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -141,7 +141,7 @@ clAuiTabArt::clAuiTabArt()
m_normal_font.SetPointSize( m_normal_font.GetPointSize() + 1 );
m_selected_font = m_normal_font;
- //m_selected_font.SetWeight(wxBOLD);
+ m_selected_font.SetWeight(wxBOLD);
m_measuring_font = m_selected_font;
m_fixed_tab_width = 100;
@@ -322,7 +322,9 @@ void clAuiTabArt::DrawTab(wxDC& dc,
penColour = DrawingUtils::LightColour(bgColour, 4.0);
} else {
if ( !page.active ) {
- bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ bgColour = DrawingUtils::LightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 2.0);
+ } else {
+ bgColour = DrawingUtils::DarkColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 0.0);
}
penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
}
@@ -416,8 +418,6 @@ void clAuiTabArt::DrawTab(wxDC& dc,
btny += 1;
}
- bool bDrawCircle = false /*(close_button_state == wxAUI_BUTTON_STATE_PRESSED || close_button_state == wxAUI_BUTTON_STATE_HOVER)*/;
-
/// Defines the rectangle surrounding the X button
wxRect xRect = wxRect(curx, btny - X_RADIUS, X_DIAMETER, X_DIAMETER);
*out_button_rect = xRect;
@@ -430,19 +430,19 @@ void clAuiTabArt::DrawTab(wxDC& dc,
wxPoint2DDouble ptXTopLeft(x_square, y_square);
wxRect2DDouble insideRect(ptXTopLeft.m_x, ptXTopLeft.m_y, xx_width, xx_width);
- insideRect.Inset(bDrawCircle ? 2.0 : 1.0 , bDrawCircle ? 2.0 : 1.0); // Shrink it by 1 pixle
+ insideRect.Inset(1.0 , 1.0); // Shrink it by 1 pixle
- if ( bDrawCircle ) {
- /// Draw the button using a circle with radius of 5px
- wxGraphicsPath button_path = gdc.GetGraphicsContext()->CreatePath();
-
- /// Draw the circle surrounding the X
- button_path.AddCircle( circleCenter.x, circleCenter.y, X_RADIUS );
- gdc.SetPen( wxPen("#202020", 2) );
- gdc.SetBrush( wxBrush("#202020"));
- gdc.GetGraphicsContext()->FillPath( button_path );
- gdc.GetGraphicsContext()->StrokePath( button_path );
- }
+ //if ( bDrawCircle ) {
+ // /// Draw the button using a circle with radius of 5px
+ // wxGraphicsPath button_path = gdc.GetGraphicsContext()->CreatePath();
+ //
+ // /// Draw the circle surrounding the X
+ // button_path.AddCircle( circleCenter.x, circleCenter.y, X_RADIUS );
+ // gdc.SetPen( wxPen("#202020", 2) );
+ // gdc.SetBrush( wxBrush("#202020"));
+ // gdc.GetGraphicsContext()->FillPath( button_path );
+ // gdc.GetGraphicsContext()->StrokePath( button_path );
+ //}
/// Draw the 'x' itself
wxGraphicsPath xpath = gdc.GetGraphicsContext()->CreatePath();
@@ -450,7 +450,7 @@ void clAuiTabArt::DrawTab(wxDC& dc,
xpath.AddLineToPoint( insideRect.GetRightBottom());
xpath.MoveToPoint( insideRect.GetRightTop() );
xpath.AddLineToPoint( insideRect.GetLeftBottom() );
- gdc.SetPen( bDrawCircle ? wxPen(*wxWHITE, 2) : wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW), 2));
+ gdc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW), 2) );
gdc.GetGraphicsContext()->StrokePath( xpath );
curx += X_DIAMETER;
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_notebook_art.cpp | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 20:25:21
|
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 5ba2354b3f09f4c38c82b85da22d4e38962362a8 (commit)
from 7ac1dcb490a2755d6fa21895ad1b056db40f3cec (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/5ba2354b3f09f4c38c82b85da22d4e38962362a8
commit 5ba2354b3f09f4c38c82b85da22d4e38962362a8
Author: eran <era...@gm...>
Date: Mon Apr 15 23:25:07 2013 +0300
wxAUI: don't draw a circle around the 'x' button
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 69aa348..5b16260 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -416,7 +416,7 @@ void clAuiTabArt::DrawTab(wxDC& dc,
btny += 1;
}
- bool bDrawCircle = (close_button_state == wxAUI_BUTTON_STATE_PRESSED || close_button_state == wxAUI_BUTTON_STATE_HOVER);
+ bool bDrawCircle = false /*(close_button_state == wxAUI_BUTTON_STATE_PRESSED || close_button_state == wxAUI_BUTTON_STATE_HOVER)*/;
/// Defines the rectangle surrounding the X button
wxRect xRect = wxRect(curx, btny - X_RADIUS, X_DIAMETER, X_DIAMETER);
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_notebook_art.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 20:17:40
|
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 7ac1dcb490a2755d6fa21895ad1b056db40f3cec (commit)
from 5996bdd3decd2a33124b15d0fd1aca98133594f1 (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/7ac1dcb490a2755d6fa21895ad1b056db40f3cec
commit 7ac1dcb490a2755d6fa21895ad1b056db40f3cec
Author: eran <era...@gm...>
Date: Mon Apr 15 23:17:22 2013 +0300
added missing inculde file
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 44705fb..c2c9623 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -1,6 +1,7 @@
#include "cl_aui_dock_art.h"
#include "imanager.h"
#include <wx/dcmemory.h>
+#include <wx/settings.h>
#include <editor_config.h>
// --------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_dock_art.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 14:29:30
|
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 5996bdd3decd2a33124b15d0fd1aca98133594f1 (commit)
from b0b4a0629cd55d5603480c5c2b50399081d044ab (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/5996bdd3decd2a33124b15d0fd1aca98133594f1
commit 5996bdd3decd2a33124b15d0fd1aca98133594f1
Author: eran <era...@gm...>
Date: Mon Apr 15 17:29:13 2013 +0300
Further enhanced the dark theme colours
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 46703eb..44705fb 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -1,6 +1,7 @@
#include "cl_aui_dock_art.h"
#include "imanager.h"
#include <wx/dcmemory.h>
+#include <editor_config.h>
// --------------------------------------------
@@ -124,20 +125,34 @@ void clAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
memDc.SetPen(*wxTRANSPARENT_PEN);
memDc.SetFont(m_captionFont);
-
- DrawCaptionBackground(memDc, tmpRect, (pane.state & wxAuiPaneInfo::optionActive) ? true : false);
-
+
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ bool isDarkTheme = DrawingUtils::IsDark(bgColour);
+
+ if ( !isDarkTheme ) {
+ DrawCaptionBackground(memDc, tmpRect, (pane.state & wxAuiPaneInfo::optionActive) ? true : false);
+
+ } else {
+ memDc.SetPen( *wxBLACK );
+ memDc.SetBrush( bgColour );
+ memDc.DrawRectangle( tmpRect );
+ }
+
int caption_offset = 0;
if ( pane.icon.IsOk() ) {
DrawIcon(memDc, tmpRect, pane);
caption_offset += pane.icon.GetWidth() + 3;
}
-
- if (pane.state & wxAuiPaneInfo::optionActive)
- memDc.SetTextForeground(m_activeCaptionTextColour);
- else
- memDc.SetTextForeground(m_inactiveCaptionTextColour);
-
+
+ if ( !isDarkTheme ) {
+ if (pane.state & wxAuiPaneInfo::optionActive)
+ memDc.SetTextForeground(m_activeCaptionTextColour);
+ else
+ memDc.SetTextForeground(m_inactiveCaptionTextColour);
+ } else {
+ memDc.SetTextForeground( EditorConfigST::Get()->GetCurrentOutputviewFgColour() );
+ }
+
wxCoord w,h;
memDc.GetTextExtent(wxT("ABCDEFHXfgkj"), &w, &h);
@@ -159,3 +174,69 @@ void clAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
memDc.SelectObject(wxNullBitmap);
dc.DrawBitmap( bmp, rect.x, rect.y, true );
}
+
+void clAuiDockArt::DrawBackground(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect)
+{
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ wxColour penColour;
+
+ // Determine the pen colour
+ if ( DrawingUtils::IsDark(bgColour)) {
+ penColour = DrawingUtils::LightColour(bgColour, 4.0);
+ } else {
+ penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ }
+
+ // Now set the bg colour. It must be done after setting
+ // the pen colour
+ if ( !DrawingUtils::IsDark(bgColour) ) {
+ bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ } else {
+ bgColour = DrawingUtils::LightColour(bgColour, 3.0);
+ }
+
+ dc.SetPen(bgColour);
+ dc.SetBrush(bgColour);
+ dc.DrawRectangle(rect);
+ dc.SetPen(penColour);
+}
+
+void clAuiDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wxAuiPaneInfo& pane)
+{
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ wxColour penColour;
+
+ // Determine the pen colour
+ if ( !DrawingUtils::IsDark(bgColour)) {
+ wxAuiDefaultDockArt::DrawBorder(dc, window, rect, pane);
+ return;
+ }
+
+ penColour = DrawingUtils::LightColour(bgColour, 4.0);
+ dc.SetPen(penColour);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect);
+
+}
+
+void clAuiDockArt::DrawSash(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect)
+{
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ if ( !DrawingUtils::IsDark(bgColour) ) {
+ wxAuiDefaultDockArt::DrawSash(dc, window, orientation, rect);
+ return;
+ }
+
+ // dark theme
+#if defined(__WXMAC__) || defined (__WXGTK__)
+ wxAuiDefaultDockArt::DrawSash(dc, window, orientation, rect);
+ return;
+#endif
+
+ // MSW
+ wxUnusedVar(window);
+ wxUnusedVar(orientation);
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(bgColour);
+ dc.DrawRectangle(rect);
+}
diff --git a/Plugin/cl_aui_dock_art.h b/Plugin/cl_aui_dock_art.h
index 6c99436..010f5f1 100644
--- a/Plugin/cl_aui_dock_art.h
+++ b/Plugin/cl_aui_dock_art.h
@@ -8,6 +8,7 @@
#include <wx/aui/dockart.h>
#include "imanager.h"
#include "codelite_exports.h"
+#include <wx/aui/auibar.h>
class WXDLLIMPEXP_SDK clAuiDockArt : public wxAuiDefaultDockArt
{
@@ -18,7 +19,8 @@ class WXDLLIMPEXP_SDK clAuiDockArt : public wxAuiDefaultDockArt
public:
clAuiDockArt(IManager *manager);
virtual ~clAuiDockArt();
-
+
+ virtual void DrawBorder(wxDC& dc, wxWindow* window, const wxRect& rect, wxAuiPaneInfo& pane);
virtual void DrawCaption(wxDC& dc, wxWindow *window,
const wxString& text,
const wxRect& rect,
@@ -29,6 +31,9 @@ public:
int button_state,
const wxRect& _rect,
wxAuiPaneInfo& pane);
+ virtual void DrawBackground(wxDC& dc, wxWindow* window, int orientation, const wxRect& rect);
+
+ virtual void DrawSash(wxDC& dc, wxWindow* window, int orientation, const wxRect &rect);
};
#endif // CLAUIDOCKART_H
diff --git a/Plugin/cl_aui_tb_are.cpp b/Plugin/cl_aui_tb_are.cpp
index 27207ef..1627e4a 100644
--- a/Plugin/cl_aui_tb_are.cpp
+++ b/Plugin/cl_aui_tb_are.cpp
@@ -27,66 +27,106 @@ CLMainAuiTBArt::~CLMainAuiTBArt()
void CLMainAuiTBArt::DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect)
{
- wxAuiDefaultToolBarArt::DrawBackground(dc, wnd, rect);
-
-// static wxColor col1, col2;
-// if(col1.IsOk() == false) {
-// col1 = DrawingUtils::GetPanelBgColour();
-// }
-// if(col2.IsOk() == false) {
-// col2 = DrawingUtils::DarkColour(col1, 2.0);
-// }
-//
-// if(m_mswWithThemeEnabled) {
-// col1 = DrawingUtils::LightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTACTIVECAPTION), 2.0);
-// col2 = DrawingUtils::LightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTACTIVECAPTION), 2.0);
-// }
-//
-//#if 0
-// DrawingUtils::PaintStraightGradientBox(dc, rect, col1, col2, true);
-//
-//#else // Mac / Linux
-// dc.SetPen (col1);
-// dc.SetBrush(col1);
-// dc.DrawRectangle(rect);
-//#endif
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ wxColour penColour;
+
+ // Determine the pen colour
+ if ( !DrawingUtils::IsDark(bgColour)) {
+ wxAuiDefaultToolBarArt::DrawBackground(dc, wnd, rect);
+ return;
+
+ } else {
+ penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ }
+
+ // Now set the bg colour. It must be done after setting
+ // the pen colour
+ wxColour bgColour2 = bgColour;
+ bgColour = DrawingUtils::LightColour(bgColour, 3.0);
+
+ dc.SetPen(bgColour);
+ dc.SetBrush(bgColour);
+ dc.DrawRectangle(rect);
+ dc.GradientFillLinear(rect, bgColour2, bgColour, wxNORTH);
}
void CLMainAuiTBArt::DrawGripper(wxDC& dc, wxWindow* wnd, const wxRect& rect)
{
- wxAuiDefaultToolBarArt::DrawGripper(dc, wnd, rect);
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+
+ if ( !DrawingUtils::IsDark(bgColour)) {
+ wxAuiDefaultToolBarArt::DrawGripper(dc, wnd, rect);
+ return;
+ }
+
+ wxColour gp1, gp2, gp3;
+ gp3 = DrawingUtils::LightColour(bgColour, 1.0);
+ gp2 = DrawingUtils::LightColour(bgColour, 2.0);
+ gp1 = DrawingUtils::LightColour(bgColour, 3.0);
+
+ int i = 0;
+ while (1) {
+ int x, y;
+
+ if (m_flags & wxAUI_TB_VERTICAL) {
+ x = rect.x + (i*4) + 5;
+ y = rect.y + 3;
+ if (x > rect.GetWidth()-5)
+ break;
+ } else {
+ x = rect.x + 3;
+ y = rect.y + (i*4) + 5;
+ if (y > rect.GetHeight()-5)
+ break;
+ }
+
+ dc.SetPen(gp1);
+ dc.DrawPoint(x, y);
+ dc.SetPen(gp2);
+ dc.DrawPoint(x, y+1);
+ dc.DrawPoint(x+1, y);
+ dc.SetPen(gp3);
+ dc.DrawPoint(x+2, y+1);
+ dc.DrawPoint(x+2, y+2);
+ dc.DrawPoint(x+1, y+2);
+
+ i++;
+ }
+
}
void CLMainAuiTBArt::DrawSeparator(wxDC& dc, wxWindow* wnd, const wxRect& _rect)
{
- if(m_mswWithThemeEnabled) {
- bool horizontal = true;
- if (m_flags & wxAUI_TB_VERTICAL)
- horizontal = false;
-
- wxRect rect = _rect;
-
- if (horizontal) {
- rect.x += (rect.width/2);
- rect.width = 1;
- int new_height = (rect.height*3)/4;
- rect.y += (rect.height/2) - (new_height/2);
- rect.height = new_height;
- } else {
- rect.y += (rect.height/2);
- rect.height = 1;
- int new_width = (rect.width*3)/4;
- rect.x += (rect.width/2) - (new_width/2);
- rect.width = new_width;
- }
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
- wxColour start_colour = DrawingUtils::LightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTACTIVECAPTION), 2.0);
- wxColour end_colour = DrawingUtils::LightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRADIENTACTIVECAPTION), 2.0);
- dc.GradientFillLinear(rect, start_colour, end_colour, horizontal ? wxSOUTH : wxEAST);
+ if ( !DrawingUtils::IsDark(bgColour)) {
+ wxAuiDefaultToolBarArt::DrawSeparator(dc, wnd, _rect);
+ return;
+ }
+
+ bool horizontal = true;
+ if (m_flags & wxAUI_TB_VERTICAL)
+ horizontal = false;
+ wxRect rect = _rect;
+
+ if (horizontal) {
+ rect.x += (rect.width/2);
+ rect.width = 1;
+ int new_height = (rect.height*3)/4;
+ rect.y += (rect.height/2) - (new_height/2);
+ rect.height = new_height;
} else {
- wxAuiDefaultToolBarArt::DrawSeparator(dc, wnd, _rect);
+ rect.y += (rect.height/2);
+ rect.height = 1;
+ int new_width = (rect.width*3)/4;
+ rect.x += (rect.width/2) - (new_width/2);
+ rect.width = new_width;
}
+
+ wxColour startColour = bgColour.ChangeLightness(80);
+ wxColour endColour = bgColour.ChangeLightness(80);
+ dc.GradientFillLinear(rect, startColour, endColour, horizontal ? wxSOUTH : wxEAST);
}
#endif
diff --git a/Plugin/cl_aui_tb_are.h b/Plugin/cl_aui_tb_are.h
index 509351a..1445a48 100644
--- a/Plugin/cl_aui_tb_are.h
+++ b/Plugin/cl_aui_tb_are.h
@@ -9,21 +9,21 @@
#include "codelite_exports.h"
#if USE_AUI_TOOLBAR
-
+
#include <wx/aui/auibar.h>
-class WXDLLIMPEXP_SDK CLMainAuiTBArt : public wxAuiDefaultToolBarArt
+class WXDLLIMPEXP_SDK CLMainAuiTBArt : public wxAuiDefaultToolBarArt
{
- bool m_mswWithThemeEnabled;
-
-public:
- CLMainAuiTBArt();
- virtual ~CLMainAuiTBArt();
-
- virtual void DrawGripper( wxDC& dc, wxWindow* wnd, const wxRect& rect);
- virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect);
- virtual void DrawSeparator(wxDC& dc, wxWindow* wnd, const wxRect& rect);
-};
+ bool m_mswWithThemeEnabled;
+
+public:
+ CLMainAuiTBArt();
+ virtual ~CLMainAuiTBArt();
+
+ virtual void DrawGripper( wxDC& dc, wxWindow* wnd, const wxRect& rect);
+ virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+ virtual void DrawSeparator(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+};
#endif
#endif // CL_AUI_TOOLBAR_ART_H
diff --git a/Plugin/plugin_sdk.project b/Plugin/plugin_sdk.project
index e0313ff..3b68622 100644
--- a/Plugin/plugin_sdk.project
+++ b/Plugin/plugin_sdk.project
@@ -161,8 +161,6 @@
<File Name="listctrl_improved.cpp"/>
<File Name="cl_editor_tip_window.cpp"/>
<File Name="cl_editor_tip_window.h"/>
- <File Name="cl_aui_tb_are.h"/>
- <File Name="cl_aui_tb_are.cpp"/>
<File Name="cl_treelistctrl.h"/>
<File Name="cl_treelistctrl.cpp"/>
<File Name="my_menu_bar.h"/>
@@ -210,14 +208,16 @@
<File Name="notebook_ex_nav_dlg.h"/>
<File Name="tabicons.h"/>
<File Name="tabicons.cpp"/>
- <File Name="cl_aui_notebook_art.cpp"/>
- <File Name="cl_aui_notebook_art.h"/>
<File Name="gtk_notebook_ex.cpp"/>
<File Name="gtk_notebook_ex.h"/>
</VirtualDirectory>
<VirtualDirectory Name="wxAUI">
<File Name="cl_aui_dock_art.h"/>
<File Name="cl_aui_dock_art.cpp"/>
+ <File Name="cl_aui_tb_are.cpp"/>
+ <File Name="cl_aui_tb_are.h"/>
+ <File Name="cl_aui_notebook_art.cpp"/>
+ <File Name="cl_aui_notebook_art.h"/>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="JobQueue">
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_dock_art.cpp | 99 +++++++++++++++++++++++++++++---
Plugin/cl_aui_dock_art.h | 7 ++-
Plugin/cl_aui_tb_are.cpp | 136 ++++++++++++++++++++++++++++---------------
Plugin/cl_aui_tb_are.h | 24 ++++----
Plugin/plugin_sdk.project | 8 +-
5 files changed, 200 insertions(+), 74 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 13:13:49
|
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 b0b4a0629cd55d5603480c5c2b50399081d044ab (commit)
from 98d77a6c1a7b3a4077e56ffbe8d9a35af4333441 (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/b0b4a0629cd55d5603480c5c2b50399081d044ab
commit b0b4a0629cd55d5603480c5c2b50399081d044ab
Author: eran <era...@gm...>
Date: Mon Apr 15 16:13:37 2013 +0300
Removed obselete code
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 79a9e59..69aa348 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -409,19 +409,8 @@ void clAuiTabArt::DrawTab(wxDC& dc,
/// Draw the X button on the tab
if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) {
- bool themeEnabled = false;
-#ifdef __WXMSW__
- int major, minor;
-
- wxGetOsVersion(&major, &minor);
-
- if(wxUxThemeEngine::GetIfActive() && major >= 6 /* Win 7 and up */) {
- themeEnabled = true;
- }
-#endif
- curx += (themeEnabled ? 2 : 4);
+ curx += 4;
int btny = (rr.y + (rr.height/2));
-
if ( close_button_state == wxAUI_BUTTON_STATE_PRESSED ) {
curx += 1;
btny += 1;
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_notebook_art.cpp | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-15 06:15:47
|
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 98d77a6c1a7b3a4077e56ffbe8d9a35af4333441 (commit)
from 9aa0eca6648b621a9ffcfabb5ddd0e226a96f44e (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/98d77a6c1a7b3a4077e56ffbe8d9a35af4333441
commit 98d77a6c1a7b3a4077e56ffbe8d9a35af4333441
Author: eran <era...@gm...>
Date: Mon Apr 15 09:15:12 2013 +0300
When changing the colouring theme to a dark theme, codelite will also update the colours of the tabs to fit the new theme colours
http://forums.codelite.org/viewtopic.php?f=13&t=1976
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 7c99987..7fc5b49 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -40,7 +40,7 @@
<![CDATA[]]>
</Environment>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -102,7 +102,7 @@
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Unix_Custom_Makefile" Selected="yes">
+ <WorkspaceConfiguration Name="Unix_Custom_Makefile" Selected="no">
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
<Project Name="CallGraph" ConfigName="DebugUnicode"/>
<Project Name="CodeFormatter" ConfigName="WinDebugUnicode"/>
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index dbeb114..79a9e59 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -3,6 +3,7 @@
#include <wx/dcgraph.h>
#include "plugin_general_wxcp.h"
#include <wx/dcmemory.h>
+#include <editor_config.h>
#ifdef __WXMSW__
# include <wx/msw/uxtheme.h>
@@ -271,36 +272,31 @@ void clAuiTabArt::DrawBackground(wxDC& dc,
}
gdc.SetGraphicsContext(context);
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ wxColour penColour;
+
+ // Determine the pen colour
+ if ( DrawingUtils::IsDark(bgColour)) {
+ penColour = DrawingUtils::LightColour(bgColour, 4.0);
+ } else {
+ penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ }
+
+ // Now set the bg colour. It must be done after setting
+ // the pen colour
+ if ( !DrawingUtils::IsDark(bgColour) ) {
+ bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ } else {
+ bgColour = DrawingUtils::LightColour(bgColour, 3.0);
+ }
- wxRect r;
-
- if (m_flags &wxAUI_NB_BOTTOM)
- r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
-
- // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
- // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
- else //for wxAUI_NB_TOP
- r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
-
- gdc.SetPen(m_base_colour);
- gdc.SetBrush(m_base_colour);
- gdc.DrawRectangle(r);
-
- // draw base lines
- int y = rect.GetHeight();
- int w = rect.GetWidth();
-
- gdc.SetPen(m_border_pen);
- if (m_flags &wxAUI_NB_BOTTOM) {
- gdc.SetBrush(m_bottom_rect_colour);
- gdc.DrawRectangle(-1, 0, w+2, 4);
- } else { //for wxAUI_NB_TOP
- gdc.SetBrush(m_bottom_rect_colour);
- gdc.DrawRectangle(-1, y-4, w+2, 4);
- }
+ gdc.SetPen(bgColour);
+ gdc.SetBrush(bgColour);
+ gdc.DrawRectangle(rect);
+ gdc.SetPen(penColour);
+ gdc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight());
}
-
// DrawTab() draws an individual tab.
//
// dc - output dc
@@ -319,6 +315,18 @@ void clAuiTabArt::DrawTab(wxDC& dc,
wxRect* out_button_rect,
int* x_extent)
{
+ wxColour bgColour = wxColour(EditorConfigST::Get()->GetCurrentOutputviewBgColour());
+ wxColour penColour;
+ bool isBgColourDark = DrawingUtils::IsDark(bgColour);
+ if ( isBgColourDark ) {
+ penColour = DrawingUtils::LightColour(bgColour, 4.0);
+ } else {
+ if ( !page.active ) {
+ bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ }
+ penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ }
+
int curx = 0;
wxGCDC gdc;
wxGraphicsRenderer* const renderer = wxGraphicsRenderer::GetDefaultRenderer();
@@ -337,14 +345,14 @@ void clAuiTabArt::DrawTab(wxDC& dc,
gdc.SetGraphicsContext(context);
wxGraphicsPath path = gdc.GetGraphicsContext()->CreatePath();
- gdc.SetBrush( page.active ? m_bottom_rect_colour : m_base_colour);
- gdc.SetPen( m_border_pen );
+ gdc.SetPen( penColour );
wxSize sz = GetTabSize(gdc, wnd, page.caption, page.bitmap, page.active, close_button_state, x_extent);
wxRect rr (in_rect.GetTopLeft(), sz);
rr.y += 2;
rr.width -= 2;
+ rr.height += 4;
/// the tab start position (x)
curx = rr.x + 8;
@@ -357,31 +365,16 @@ void clAuiTabArt::DrawTab(wxDC& dc,
// since the above code above doesn't play well with WXDFB or WXCOCOA,
// we'll just use a rectangle for the clipping region for now --
gdc.SetClippingRegion(rr.x, rr.y, clip_width+1, rr.height);
-
path.AddRoundedRectangle(rr.x, rr.y, rr.width, rr.height, 5.0);
+
+ gdc.SetBrush( bgColour );
gdc.GetGraphicsContext()->FillPath( path );
gdc.GetGraphicsContext()->StrokePath( path );
- wxRect bottomRect(rr.x, rr.y + rr.height - 1, rr.width, 2);
- gdc.SetBrush(m_bottom_rect_colour);
- gdc.SetPen(m_bottom_rect_colour);
- gdc.DrawRectangle(bottomRect.x, bottomRect.y, bottomRect.width, bottomRect.height);
-
- gdc.SetPen(m_border_pen);
- gdc.DrawLine(rr.x-1, in_rect.y + in_rect.height - 1, rr.x + rr.width+1, in_rect.y + in_rect.height - 1);
-
- gdc.SetPen(m_bottom_rect_colour);
- gdc.DrawLine(rr.x-1, in_rect.y + in_rect.height - 2, rr.x + rr.width+1, in_rect.y + in_rect.height - 2);
- gdc.DrawLine(rr.x-1, in_rect.y + in_rect.height - 3, rr.x + rr.width+1, in_rect.y + in_rect.height - 3);
-
if ( !page.active ) {
- gdc.SetPen(m_border_pen);
- }
- gdc.DrawLine(rr.x-1, in_rect.y + in_rect.height - 4, rr.x + rr.width+1, in_rect.y + in_rect.height - 4);
-
- if ( page.active ) {
- gdc.SetPen(m_bottom_rect_colour);
- gdc.DrawPoint(rr.x + rr.width+1, in_rect.y + in_rect.height - 4);
+ // Draw a line at the bottom rect
+ gdc.SetPen(penColour);
+ gdc.DrawLine(in_rect.GetBottomLeft(), in_rect.GetBottomRight());
}
/// Draw the text
@@ -394,7 +387,12 @@ void clAuiTabArt::DrawTab(wxDC& dc,
wxSize ext = gdc.GetTextExtent( caption );
if ( caption == "Tp" )
caption.Clear();
-
+
+ if ( page.active ) {
+ gdc.SetTextForeground( EditorConfigST::Get()->GetCurrentOutputviewFgColour() );
+ } else {
+ gdc.SetTextForeground( isBgColourDark ? wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) : EditorConfigST::Get()->GetCurrentOutputviewFgColour() );
+ }
gdc.GetGraphicsContext()->DrawText( page.caption, rr.x + 8, (rr.y + (rr.height - ext.y)/2));
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 +-
Plugin/cl_aui_notebook_art.cpp | 98 +++++++++++++++++++--------------------
2 files changed, 50 insertions(+), 52 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-14 14:26:00
|
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 9aa0eca6648b621a9ffcfabb5ddd0e226a96f44e (commit)
from ae390f59559cffe483373635eaeeb6372f243f88 (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/9aa0eca6648b621a9ffcfabb5ddd0e226a96f44e
commit 9aa0eca6648b621a9ffcfabb5ddd0e226a96f44e
Author: Eran <era...@gm...>
Date: Sun Apr 14 17:25:50 2013 +0300
Added 2 small script files which wraps codelitegcc with g++/gcc (Linux only)
diff --git a/LiteEditor/CMakeLists.txt b/LiteEditor/CMakeLists.txt
index 170a246..a3c5fc7 100644
--- a/LiteEditor/CMakeLists.txt
+++ b/LiteEditor/CMakeLists.txt
@@ -80,6 +80,8 @@ install(FILES ${CL_SRC_ROOT}/Runtime/codelite_exec DESTINATION ${CL_PREFIX}/bin
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_fix_files DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_kill_children DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_xterm DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
+install(FILES ${CL_SRC_ROOT}/Runtime/clg++ DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
+install(FILES ${CL_SRC_ROOT}/Runtime/clgcc DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
## codelite icons
install(FILES ${CL_SRC_ROOT}/Runtime/codelite-icons-fresh-farm.zip DESTINATION ${CL_PREFIX}/share/codelite)
diff --git a/Runtime/clg++ b/Runtime/clg++
new file mode 100755
index 0000000..074f66e
--- /dev/null
+++ b/Runtime/clg++
@@ -0,0 +1,4 @@
+#!/bin/bash
+codelitegcc g++ $@
+
+
diff --git a/Runtime/clgcc b/Runtime/clgcc
new file mode 100755
index 0000000..5725394
--- /dev/null
+++ b/Runtime/clgcc
@@ -0,0 +1,3 @@
+#!/bin/bash
+codelitegcc gcc $@
+
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/CMakeLists.txt | 2 ++
Runtime/clg++ | 4 ++++
Runtime/clgcc | 3 +++
3 files changed, 9 insertions(+), 0 deletions(-)
create mode 100755 Runtime/clg++
create mode 100755 Runtime/clgcc
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-13 06:01:51
|
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 ae390f59559cffe483373635eaeeb6372f243f88 (commit)
from b32b29c8e7f1a5de0412a0ff008f408ada646836 (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/ae390f59559cffe483373635eaeeb6372f243f88
commit ae390f59559cffe483373635eaeeb6372f243f88
Author: eran <era...@gm...>
Date: Sat Apr 13 09:00:04 2013 +0300
Prompt the user if a workspace is created in an invalid path
diff --git a/LiteEditor/newworkspacedlg.cpp b/LiteEditor/newworkspacedlg.cpp
index e005d07..34a5024 100644
--- a/LiteEditor/newworkspacedlg.cpp
+++ b/LiteEditor/newworkspacedlg.cpp
@@ -1,28 +1,28 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
-// copyright : (C) 2008 by Eran Ifrah
-// file name : newworkspacedlg.cpp
-//
+// copyright : (C) 2008 by Eran Ifrah
+// file name : newworkspacedlg.cpp
+//
// -------------------------------------------------------------------------
-// A
-// _____ _ _ _ _
-// / __ \ | | | | (_) |
-// | / \/ ___ __| | ___| | _| |_ ___
-// | | / _ \ / _ |/ _ \ | | | __/ _ )
-// | \__/\ (_) | (_| | __/ |___| | || __/
-// \____/\___/ \__,_|\___\_____/_|\__\___|
-//
-// F i l e
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
+// A
+// _____ _ _ _ _
+// / __ \ | | | | (_) |
+// | / \/ ___ __| | ___| | _| |_ ___
+// | | / _ \ / _ |/ _ \ | | | __/ _ )
+// | \__/\ (_) | (_| | __/ |___| | || __/
+// \____/\___/ \__,_|\___\_____/_|\__\___|
+//
+// F i l e
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
- #include "newworkspacedlg.h"
+#include "newworkspacedlg.h"
#include "windowattrmanager.h"
#include "globals.h"
#include "wx/msgdlg.h"
@@ -30,72 +30,81 @@
#include "wx/filename.h"
NewWorkspaceDlg::NewWorkspaceDlg( wxWindow* parent )
- :
- NewWorkspaceBase( parent )
+ :
+ NewWorkspaceBase( parent )
{
- m_textCtrlWorkspacePath->SetValue(wxGetCwd());
- m_textCtrlWorkspaceName->SetFocus();
-
- WindowAttrManager::Load(this, wxT("NewWorkspaceDlgAttr"), NULL);
- Centre();
+ m_textCtrlWorkspacePath->SetValue(wxGetCwd());
+ m_textCtrlWorkspaceName->SetFocus();
+
+ WindowAttrManager::Load(this, wxT("NewWorkspaceDlgAttr"), NULL);
+ Centre();
}
NewWorkspaceDlg::~NewWorkspaceDlg()
{
- WindowAttrManager::Save(this, wxT("NewWorkspaceDlgAttr"), NULL);
+ WindowAttrManager::Save(this, wxT("NewWorkspaceDlgAttr"), NULL);
}
void NewWorkspaceDlg::OnWorkspacePathUpdated( wxCommandEvent& event )
{
- //update the static text control with the actual path
+ //update the static text control with the actual path
- wxString workspacePath;
- workspacePath << m_textCtrlWorkspacePath->GetValue();
+ wxString workspacePath;
+ workspacePath << m_textCtrlWorkspacePath->GetValue();
- workspacePath = workspacePath.Trim().Trim(false);
+ workspacePath = workspacePath.Trim().Trim(false);
- wxString tmpSep( wxFileName::GetPathSeparator() );
- if ( !workspacePath.EndsWith(tmpSep) && workspacePath.IsEmpty() == false ) {
- workspacePath << wxFileName::GetPathSeparator();
- }
-
- if( m_textCtrlWorkspaceName->GetValue().Trim().Trim(false).IsEmpty() ) {
- m_staticTextWorkspaceFileName->SetLabel(wxEmptyString);
- return;
- }
-
- if( m_checkBoxCreateSeparateDir->IsChecked() ) {
- workspacePath << m_textCtrlWorkspaceName->GetValue();
- workspacePath << wxFileName::GetPathSeparator();
- }
-
- workspacePath << m_textCtrlWorkspaceName->GetValue();
- workspacePath << wxT(".workspace");
- m_staticTextWorkspaceFileName->SetLabel( workspacePath );
+ wxString tmpSep( wxFileName::GetPathSeparator() );
+ if ( !workspacePath.EndsWith(tmpSep) && workspacePath.IsEmpty() == false ) {
+ workspacePath << wxFileName::GetPathSeparator();
+ }
+
+ if( m_textCtrlWorkspaceName->GetValue().Trim().Trim(false).IsEmpty() ) {
+ m_staticTextWorkspaceFileName->SetLabel(wxEmptyString);
+ return;
+ }
+
+ if( m_checkBoxCreateSeparateDir->IsChecked() ) {
+ workspacePath << m_textCtrlWorkspaceName->GetValue();
+ workspacePath << wxFileName::GetPathSeparator();
+ }
+
+ workspacePath << m_textCtrlWorkspaceName->GetValue();
+ workspacePath << wxT(".workspace");
+ m_staticTextWorkspaceFileName->SetLabel( workspacePath );
}
void NewWorkspaceDlg::OnWorkspaceDirPicker( wxCommandEvent& event )
{
- const wxString& dir = wxDirSelector(_("Choose a folder:"));
- if ( !dir.empty() ) {
- m_textCtrlWorkspacePath->SetValue( dir );
- }
+ const wxString& dir = wxDirSelector(_("Choose a folder:"));
+ if ( !dir.empty() ) {
+
+ static wxString INVALID_CHARS = " ,'()";
+ if ( dir.find_first_of(INVALID_CHARS) != wxString::npos ) {
+ int answer = ::wxMessageBox(wxString() << _("The selected project path '") << dir << _("'\nContains some invalid characters\nContinue anyways?"), "CodeLite", wxYES_NO|wxCANCEL|wxICON_WARNING, this);
+ if ( answer != wxYES ) {
+ return;
+ }
+ }
+
+ m_textCtrlWorkspacePath->ChangeValue( dir );
+ }
}
void NewWorkspaceDlg::OnButtonCreate( wxCommandEvent& event )
{
- //validate that the path part is valid
- m_workspacePath = m_staticTextWorkspaceFileName->GetLabel();
- wxFileName fn(m_workspacePath);
-
- if( m_checkBoxCreateSeparateDir->IsChecked() ){
- // dont test the result
- fn.Mkdir(fn.GetPath(), 0777, wxPATH_MKDIR_FULL);
- }
-
- if ( !wxDirExists(fn.GetPath()) ) {
- wxMessageBox(_("Invalid path: ") + fn.GetPath(), _("Error"), wxOK | wxICON_HAND);
- return;
- }
- EndModal(wxID_OK);
+ //validate that the path part is valid
+ m_workspacePath = m_staticTextWorkspaceFileName->GetLabel();
+ wxFileName fn(m_workspacePath);
+
+ if( m_checkBoxCreateSeparateDir->IsChecked() ) {
+ // dont test the result
+ fn.Mkdir(fn.GetPath(), 0777, wxPATH_MKDIR_FULL);
+ }
+
+ if ( !wxDirExists(fn.GetPath()) ) {
+ wxMessageBox(_("Invalid path: ") + fn.GetPath(), _("Error"), wxOK | wxICON_HAND);
+ return;
+ }
+ EndModal(wxID_OK);
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/newworkspacedlg.cpp | 143 +++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 67 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-13 05:20:46
|
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 b32b29c8e7f1a5de0412a0ff008f408ada646836 (commit)
from 9c987df7949ab142d0b6d91d7a25ded408450e9e (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/b32b29c8e7f1a5de0412a0ff008f408ada646836
commit b32b29c8e7f1a5de0412a0ff008f408ada646836
Author: eran <era...@gm...>
Date: Sat Apr 13 08:20:37 2013 +0300
Prompt the user when attempting to create a project in a directory which contains invalid characters, one of: " ,'()"
diff --git a/LiteEditor/newprojectdlg.cpp b/LiteEditor/newprojectdlg.cpp
index a4c4451..ae4171d 100644
--- a/LiteEditor/newprojectdlg.cpp
+++ b/LiteEditor/newprojectdlg.cpp
@@ -313,6 +313,14 @@ void NewProjectDlg::OnBrowseProjectPath(wxCommandEvent& event)
wxString path(m_textCtrlProjectPath->GetValue());
wxString new_path = wxDirSelector(_("Select Project Path:"), path, wxDD_DEFAULT_STYLE, wxDefaultPosition, this);
if (new_path.IsEmpty() == false) {
+
+ static wxString INVALID_CHARS = " ,'()";
+ if ( new_path.find_first_of(INVALID_CHARS) != wxString::npos ) {
+ int answer = ::wxMessageBox(wxString() << _("The selected project path '") << new_path << _("'\nContains some invalid characters\nContinue anyways?"), "CodeLite", wxYES_NO|wxCANCEL|wxICON_WARNING, this);
+ if ( answer != wxYES ) {
+ return;
+ }
+ }
m_textCtrlProjectPath->SetValue(new_path);
}
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/newprojectdlg.cpp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-04-13 05:04:37
|
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 "UNNAMED PROJECT".
The branch, master has been updated
via 9c987df7949ab142d0b6d91d7a25ded408450e9e (commit)
via b1727d748a97c1a2ead00c24d825257789232b4a (commit)
from 5b4d0b85ba713467c901667060358e6fb0fd6cd9 (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/9c987df7949ab142d0b6d91d7a25ded408450e9e
commit 9c987df7949ab142d0b6d91d7a25ded408450e9e
Merge: b1727d7 5b4d0b8
Author: eran <era...@gm...>
Date: Sat Apr 13 08:04:13 2013 +0300
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By Eran
# Via Eran
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
DB explorer: yet another minor UI change
Database Explorer: minor UI changes to the Table Settings dialog + added missing icons to git
https://sourceforge.net/p/codelite/codelitegit/ci/b1727d748a97c1a2ead00c24d825257789232b4a
commit b1727d748a97c1a2ead00c24d825257789232b4a
Author: eran <era...@gm...>
Date: Sat Apr 13 08:04:05 2013 +0300
Use wxGCDC for drawing the background colour of the custom tab art
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 62bda17..dbeb114 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -255,35 +255,48 @@ void clAuiTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
void clAuiTabArt::DrawBackground(wxDC& dc,
wxWindow* WXUNUSED(wnd),
const wxRect& rect)
-{
- // draw background
- wxColor top_color = m_base_colour;
- wxColor bottom_color = m_base_colour;
-
+{
+ wxGCDC gdc;
+ wxGraphicsRenderer* const renderer = wxGraphicsRenderer::GetDefaultRenderer();
+ wxGraphicsContext* context;
+
+ if ( wxPaintDC *paintdc = wxDynamicCast(&dc, wxPaintDC) ) {
+ context = renderer->CreateContext(*paintdc);
+
+ } else if ( wxMemoryDC *memdc = wxDynamicCast(&dc, wxMemoryDC) ) {
+ context = renderer->CreateContext(*memdc);
+ } else {
+ wxFAIL_MSG( "Unknown wxDC kind" );
+ return;
+ }
+
+ gdc.SetGraphicsContext(context);
+
wxRect r;
if (m_flags &wxAUI_NB_BOTTOM)
- r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
+ r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
+
// TODO: else if (m_flags &wxAUI_NB_LEFT) {}
// TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
else //for wxAUI_NB_TOP
- r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
- dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
+ r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
+
+ gdc.SetPen(m_base_colour);
+ gdc.SetBrush(m_base_colour);
+ gdc.DrawRectangle(r);
// draw base lines
- dc.SetPen(m_border_pen);
int y = rect.GetHeight();
int w = rect.GetWidth();
+ gdc.SetPen(m_border_pen);
if (m_flags &wxAUI_NB_BOTTOM) {
- dc.SetBrush(m_bottom_rect_colour);
- dc.DrawRectangle(-1, 0, w+2, 4);
- }
- // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
- // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
- else { //for wxAUI_NB_TOP
- dc.SetBrush(m_bottom_rect_colour);
- dc.DrawRectangle(-1, y-4, w+2, 4);
+ gdc.SetBrush(m_bottom_rect_colour);
+ gdc.DrawRectangle(-1, 0, w+2, 4);
+ } else { //for wxAUI_NB_TOP
+ gdc.SetBrush(m_bottom_rect_colour);
+ gdc.DrawRectangle(-1, y-4, w+2, 4);
}
}
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_notebook_art.cpp | 47 +++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 17 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
|
