|
From: Eran I. <no...@so...> - 2013-12-22 11:52:18
|
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 ba81e03055071a6bb7b22bf6f0b9c5556e0a6415 (commit)
from 8904be4831cd725384283616f425f1f0f2f6a43f (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/ba81e03055071a6bb7b22bf6f0b9c5556e0a6415
commit ba81e03055071a6bb7b22bf6f0b9c5556e0a6415
Author: Eran <era...@gm...>
Date: Sun Dec 22 13:52:03 2013 +0200
AUI tab drawing: draw the text in the vertical center of the tab (GTK)
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 0a5eb45..ac7c81d 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<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"/>
@@ -111,7 +111,7 @@
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Release" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -145,7 +145,7 @@
<Project Name="SFTP" ConfigName="DebugUnicode"/>
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index ee8dad0..dfe70b3 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -17,12 +17,15 @@ static const wxDouble X_DIAMETER = 2 * X_RADIUS;
# include <wx/osx/private.h>
# define TAB_HEIGHT_SPACER 10
# define TAB_Y_OFFSET 2
+# define TEXT_Y_SPACER 0
#elif defined(__WXMSW__)
# define TAB_HEIGHT_SPACER 10
# define TAB_Y_OFFSET 2
+# define TEXT_Y_SPACER 0
#else // GTK/FreeBSD
# define TAB_Y_OFFSET 5
# define TAB_HEIGHT_SPACER TAB_Y_OFFSET + 6
+# define TEXT_Y_SPACER 2
#endif
clAuiGlossyTabArt::clAuiGlossyTabArt()
@@ -188,7 +191,7 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
caption.Clear();
gdc.SetTextForeground( textColour );
- gdc.GetGraphicsContext()->DrawText( page.caption, rr.x + 8, (rr.y + (rr.height - ext.y)/2)-TAB_Y_OFFSET);
+ gdc.GetGraphicsContext()->DrawText( page.caption, rr.x + 8, (rr.y + (rr.height - ext.y)/2)-TAB_Y_OFFSET+TEXT_Y_SPACER);
// advance the X offset
curx += ext.x;
@@ -204,7 +207,7 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
/// Draw the X button on the tab
if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) {
curx += 4;
- int btny = (rr.y + (rr.height/2))-TAB_Y_OFFSET;
+ int btny = (rr.y + (rr.height/2))-TAB_Y_OFFSET+TEXT_Y_SPACER;
if ( close_button_state == wxAUI_BUTTON_STATE_PRESSED ) {
curx += 1;
btny += 1;
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 6 +++---
Plugin/cl_aui_notebook_art.cpp | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
hooks/post-receive
--
codelite
|