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

Accept scope_t instead of context_t

Browse Source 
Since styles are applied to the actual content, we only have a single scope, not a left/right scope.
This commit is contained in:
Allan Odgaard
2013-01-23 08:09:51 +01:00
parent aa71b7ccf0
commit 30c60ddc34
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ theme_t::decomposed_style_t theme_t::parse_styles (plist::dictionary_t const& pl
return res;
}
std::vector<theme_t::decomposed_style_t> theme_t::global_styles (scope::context_t const& scope)
std::vector<theme_t::decomposed_style_t> theme_t::global_styles (scope::scope_t const& scope)
{
static struct { std::string name; theme_t::color_info_t decomposed_style_t::*field; } const colorKeys[] =
{
@@ -275,11 +275,11 @@ gutter_styles_t const& theme_t::gutter_styles () const
return _gutter_styles;
}
styles_t const& theme_t::styles_for_scope (scope::context_t const& scope, std::string fontName, CGFloat fontSize) const
styles_t const& theme_t::styles_for_scope (scope::scope_t const& scope, std::string fontName, CGFloat fontSize) const
{
ASSERT(scope.left && scope.right);
ASSERT(scope);
std::map<scope::scope_t, styles_t>::iterator styles = _cache.find(scope.right);
std::map<scope::scope_t, styles_t>::iterator styles = _cache.find(scope);
if(styles == _cache.end())
{
std::multimap<double, decomposed_style_t> ordering;
@@ -314,7 +314,7 @@ styles_t const& theme_t::styles_for_scope (scope::context_t const& scope, std::s
cf::color_t selection = base.selection.is_blank() ? cf::color_t("#4D97FF54") : base.selection;
styles_t res(foreground, background, caret, selection, font, base.underlined == bool_true, base.misspelled == bool_true);
styles = _cache.insert(std::make_pair(scope.right, res)).first;
styles = _cache.insert(std::make_pair(scope, res)).first;
}
return styles->second;
}

4
Frameworks/theme/src/theme.h
View File

@@ -58,7 +58,7 @@ struct PUBLIC theme_t
bool is_dark () const;
bool is_transparent () const;
gutter_styles_t const& gutter_styles () const;
styles_t const& styles_for_scope (scope::context_t const& scope, std::string fontName, CGFloat fontSize) const;
styles_t const& styles_for_scope (scope::scope_t const& scope, std::string fontName, CGFloat fontSize) const;
void clear_cache () { _cache.clear(); }
struct color_info_t
@@ -108,7 +108,7 @@ private:
void setup_styles ();
static decomposed_style_t parse_styles (plist::dictionary_t const& plist);
static std::vector<decomposed_style_t> global_styles (scope::context_t const& scope);
static std::vector<decomposed_style_t> global_styles (scope::scope_t const& scope);
bundles::item_ptr _item;
std::vector<decomposed_style_t> _styles;