Applied patch from Michal Kurgan to disable separately use of global white space foreground and background colours (thanks).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1536 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-05-15 15:39:26 +00:00
parent b5f8992a5d
commit 1b41744c27
4 changed files with 12 additions and 6 deletions

View File

@ -9,6 +9,9 @@
src/keybindings.c, src/project.c, src/symbols.c, src/tools.c,
src/ui_utils.c: Added many widget names to different dialogs for use
with custom styles. Menu items still don't work.
* data/filetypes.common, doc/geany.docbook, src/highlighting.c:
Applied patch from Michal Kurgan to disable separately use of global
white space foreground and background colours (thanks).
2007-05-14 Nick Treleaven <nick.treleaven@btinternet.com>

View File

@ -30,8 +30,9 @@ caret_width=1;0;false;false
# set foreground and background colour of indentation guides
indent_guide=0xc0c0c0;0xffffff;false;false
# the third argument defines whether to use these values or use the default values defined by the filetypes
white_space=0xc0c0c0;0xffffff;true;false
# the third argument defines whether to use the foreground colour or use the default value defined by the filetypes
# the fourth argument defines whether to use the background colour or use the default value defined by the filetypes
white_space=0xc0c0c0;0xffffff;true;true
# style of folding icons, only first and second arguments are used, valid values are:
# first argument: 1 for boxes, 2 for circles

View File

@ -2190,10 +2190,12 @@ widget "GeanyPrefsDialog" style "geanyStyle"
<entry>The style for colouring the white space if it is shown.
The first both arguments define the foreground and
background colours, the third argument sets whether to use
the defined colours or to use the colours defined by each
filetype for the white space.
the defined foreground colour or to use the colour
defined by each filetype for the white space.
The fourth argument defines whether to use the background
colour.
</entry>
<entry>white_space=0xc0c0c0;0xffffff;true;false</entry>
<entry>white_space=0xc0c0c0;0xffffff;true;true</entry>
</row>
<row>
<entry>folding_style</entry>

View File

@ -556,7 +556,7 @@ static void styleset_common(ScintillaObject *sci, gint style_bits, filetype_id f
// bold = common whitespace settings enabled
SSM(sci, SCI_SETWHITESPACEFORE, common_style_set.styling[GCS_WHITE_SPACE].bold,
invert(common_style_set.styling[GCS_WHITE_SPACE].foreground));
SSM(sci, SCI_SETWHITESPACEBACK, common_style_set.styling[GCS_WHITE_SPACE].bold,
SSM(sci, SCI_SETWHITESPACEBACK, common_style_set.styling[GCS_WHITE_SPACE].italic,
invert(common_style_set.styling[GCS_WHITE_SPACE].background));
}