Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

Commit

Permalink
Switched editor color scheme system.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Krüger committed Feb 17, 2013
1 parent cff890b commit d0a8f06
Show file tree
Hide file tree
Showing 39 changed files with 694 additions and 1,218 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ string GetTypeParameterMarkup (IType t)
var highlightedTypeName = Highlight (t.Name, "keyword.type");
result.Append (highlightedTypeName);

var color = AlphaBlend (colorStyle.Default.Color, colorStyle.Default.BackgroundColor, optionalAlpha);
var color = AlphaBlend (colorStyle.Default.CairoColor, colorStyle.Default.CairoBackgroundColor, optionalAlpha);
var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);

result.Append ("<span foreground=\"" + colorString + "\">" + " (type parameter)</span>");
Expand Down Expand Up @@ -830,7 +830,7 @@ public TooltipInformation GetKeywordTooltip (string keyword, AstNode hintNode)
{
var result = new TooltipInformation ();

var color = AlphaBlend (colorStyle.Default.Color, colorStyle.Default.BackgroundColor, optionalAlpha);
var color = AlphaBlend (colorStyle.Default.CairoColor, colorStyle.Default.CairoBackgroundColor, optionalAlpha);
var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);

var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
Expand Down Expand Up @@ -1307,7 +1307,7 @@ public TooltipInformation GetConstraintTooltip (string keyword)
{
var result = new TooltipInformation ();

var color = AlphaBlend (colorStyle.Default.Color, colorStyle.Default.BackgroundColor, optionalAlpha);
var color = AlphaBlend (colorStyle.Default.CairoColor, colorStyle.Default.CairoBackgroundColor, optionalAlpha);
var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);

var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
Expand Down Expand Up @@ -1558,10 +1558,10 @@ string Highlight (string str, string colorScheme)
{
var style = colorStyle.GetChunkStyle (colorScheme);
if (style != null) {
var color = style.Color;
var color = style.CairoColor;

if (grayOut) {
color = AlphaBlend (color, colorStyle.Default.BackgroundColor, optionalAlpha);
color = AlphaBlend (color, colorStyle.Default.CairoBackgroundColor, optionalAlpha);
}

var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,25 @@ public override Color HexOffsetHighlighted {

public override Color HexDigit {
get {
return colorStyle.Default.Color;
return colorStyle.Default.CairoColor;
}
}

public override Color HexDigitBg {
get {
return colorStyle.Default.BackgroundColor;
return colorStyle.Default.CairoBackgroundColor;
}
}

public override Color DashedLineFg {
get {
return colorStyle.Default.Color;
return colorStyle.Default.CairoColor;
}
}

public override Color DashedLineBg {
get {
return colorStyle.Default.BackgroundColor;
return colorStyle.Default.CairoBackgroundColor;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void IChunkMarker.ChangeForeColor (TextEditor editor, Chunk chunk, ref Gdk.Color
if (!(markerStart <= chunk.Offset && chunk.Offset < markerEnd))
return;

var bgc = editor.ColorStyle.Default.BackgroundColor;
var bgc = editor.ColorStyle.Default.CairoBackgroundColor;
double alpha = 0.6;
color.Red = (ushort)(color.Red * alpha + bgc.Red * (1.0 - alpha));
color.Green = (ushort)(color.Green * alpha + bgc.Green * (1.0 - alpha));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void Stylechanged (object sender, EventArgs e)
if (checkbuttonItalic.Active)
prop |= ChunkProperties.Italic;
ChunkStyle oldStyle = (ChunkStyle)colorStore.GetValue (iter, 1);
bool useBgColor = colorbuttonBg.Alpha > 0 && (colorbuttonBg.Color.Pixel != oldStyle.BackgroundColor.Pixel || oldStyle.GotBackgroundColorAssigned);
bool useBgColor = colorbuttonBg.Alpha > 0 && (colorbuttonBg.Color.Pixel != oldStyle.CairoBackgroundColor.Pixel || oldStyle.GotBackgroundColorAssigned);
colorStore.SetValue (iter, 1, useBgColor? new ChunkStyle (colorbuttonFg.Color, colorbuttonBg.Color, prop) : new ChunkStyle (colorbuttonFg.Color, prop));

var newStyle = colorSheme.Clone ();
Expand All @@ -347,8 +347,8 @@ void HandleTreeviewColorsSelectionChanged (object sender, EventArgs e)
return;
var chunkStyle = (ChunkStyle)colorStore.GetValue (iter, 1);
var data = (ColorMetaData)colorStore.GetValue (iter, 2);
colorbuttonFg.Color = chunkStyle.Color;
colorbuttonBg.Color = chunkStyle.BackgroundColor;
colorbuttonFg.Color = chunkStyle.CairoColor;
colorbuttonBg.Color = chunkStyle.CairoBackgroundColor;
checkbuttonBold.Active = chunkStyle.Bold;
checkbuttonItalic.Active = chunkStyle.Italic;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ internal LayoutDescriptor CreateLayoutDescriptor (ErrorText errorText)
void SetColors ()
{
ColorScheme style = editor.ColorStyle;
errorGc = (HslColor)(style.GetChunkStyle ("bubble.error").Color);
warningGc = (HslColor)(style.GetChunkStyle ("bubble.warning").Color);
errorGc = (HslColor)(style.GetChunkStyle ("bubble.error").CairoColor);
warningGc = (HslColor)(style.GetChunkStyle ("bubble.warning").CairoColor);
errorMatrix = CreateColorMatrix (editor, true);
warningMatrix = CreateColorMatrix (editor, false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public void SetTextEditor (TextEditor container)
void OptionsChanged (object sender, EventArgs e)
{
TextEditor editor = (TextEditor)sender;
scrolledWindow.ModifyBg (StateType.Normal, editor.ColorStyle.Default.BackgroundColor);
scrolledWindow.ModifyBg (StateType.Normal, editor.ColorStyle.Default.CairoBackgroundColor);
}

void RemoveEvents ()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//
// AmbientColor.cs
//
// Author:
// Mike Krüger <mkrueger@xamarin.com>
//
// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using System.Xml.XPath;
using System.Reflection;

namespace Mono.TextEditor.Highlighting
{

public class AmbientColor
{
public string Name { get; private set; }
public readonly List<Tuple<string, Cairo.Color>> Colors = new List<Tuple<string, Cairo.Color>> ();

public Cairo.Color GetColor (string name)
{
return Colors.First (t => t.Item1 == name).Item2;
}

public static AmbientColor Create (XElement element, Dictionary<string, Cairo.Color> palette)
{
var result = new AmbientColor ();
foreach (var node in element.DescendantNodes ()) {
if (node.NodeType == System.Xml.XmlNodeType.Element) {
var el = (XElement)node;
switch (el.Name.LocalName) {
case "name":
result.Name = el.Value;
break;
default:
result.Colors.Add (Tuple.Create (el.Name.LocalName, ColorScheme.ParsePaletteColor (palette, el.Value)));
break;
}
}
}

return result;
}
}

}
Loading

0 comments on commit d0a8f06

Please sign in to comment.