github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

No longer necessary to set all gutter colors

Browse Source 
Previously all the colors were calculated so setting e.g. the icon color made it sort of necessary to also set the iconHover and iconPressed color.

Now the default icon hover and pressed colors are a potential user supplied icon color. Likewise, the default icon color is a potential user supplied foreground color, etc.
This commit is contained in:
Allan Odgaard
2012-09-08 01:02:47 +02:00
parent c154751045
commit 7a67248dec
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Frameworks/theme/src/theme.cc
View File

@@ -201,17 +201,10 @@ void theme_t::setup_styles ()
cf::color_t background = _styles[0].background;
_gutter_styles.divider = soften(foreground, 0.4);
_gutter_styles.selectionBorder = soften(foreground, 0.4);
_gutter_styles.foreground = soften(foreground, 0.5);
_gutter_styles.background = soften(background, 0.87);
_gutter_styles.icons = soften(foreground, 0.5);
_gutter_styles.iconsHover = soften(foreground, 0.5);
_gutter_styles.iconsPressed = soften(foreground, 0.5);
_gutter_styles.selectionForeground = soften(foreground, 0.95);
_gutter_styles.selectionBackground = soften(background, 0.95);
_gutter_styles.selectionIcons = soften(foreground, 0.95);
_gutter_styles.selectionIconsHover = soften(foreground, 0.95);
_gutter_styles.selectionIconsPressed = soften(foreground, 0.95);
}
plist::dictionary_t gutterSettings;
@@ -236,6 +229,14 @@ void theme_t::setup_styles ()
iterate(gutterKey, gutterKeys)
get_key_path(gutterSettings, gutterKey->key, _gutter_styles.*(gutterKey->field));
}
_gutter_styles.selectionBorder = _gutter_styles.selectionBorder ? _gutter_styles.selectionBorder : _gutter_styles.divider;
_gutter_styles.icons = _gutter_styles.icons ? _gutter_styles.icons : _gutter_styles.foreground;
_gutter_styles.iconsHover = _gutter_styles.iconsHover ? _gutter_styles.iconsHover : _gutter_styles.icons;
_gutter_styles.iconsPressed = _gutter_styles.iconsPressed ? _gutter_styles.iconsPressed : _gutter_styles.icons;
_gutter_styles.selectionIcons = _gutter_styles.selectionIcons ? _gutter_styles.selectionIcons : _gutter_styles.selectionForeground;
_gutter_styles.selectionIconsHover = _gutter_styles.selectionIconsHover ? _gutter_styles.selectionIconsHover : _gutter_styles.selectionIcons;
_gutter_styles.selectionIconsPressed = _gutter_styles.selectionIconsPressed ? _gutter_styles.selectionIconsPressed : _gutter_styles.selectionIcons;
}
oak::uuid_t const& theme_t::uuid () const