changed how we handle colors

This commit is contained in:
2022-03-12 21:48:09 +01:00
parent aee8c0fd3c
commit 35be02dbe2
8 changed files with 37 additions and 128 deletions

View File

@@ -60,7 +60,7 @@ class Log {
}
public static function silly(msg:Dynamic, ?pos:haxe.PosInfos) {
writer.writeLn(logLine("SILY",pos,msg), LightGrey);
writer.writeLn(logLine("SILY",pos,msg), LightGray);
#if webconsole
Debug.printWeb(logLine("SILY",pos,msg));
#end

View File

@@ -77,19 +77,19 @@ class MainTerm implements TermWriteable {
}
public function getTextColor():Color {
return ColorConvert.ccToColor(Term.getTextColor());
return Term.getTextColor();
}
public function setTextColor(colour:Color) {
Term.setTextColor(ColorConvert.colorToCC(colour));
public function setTextColor(color:Color) {
Term.setTextColor(color);
}
public function getBackgroundColor():Color {
return ColorConvert.ccToColor(Term.getBackgroundColor());
return Term.getBackgroundColor();
}
public function setBackgroundColor(color:Color) {
Term.setBackgroundColor(ColorConvert.colorToCC(color));
Term.setBackgroundColor(color);
}
public function isColor():Bool {

View File

@@ -90,19 +90,19 @@ class Screen implements TermWriteable implements IPeripheral {
}
public function getTextColor():Color {
return ColorConvert.ccToColor(nativ.getTextColor());
return nativ.getTextColor();
}
public function setTextColor(colour:Color) {
nativ.setTextColor(ColorConvert.colorToCC(colour));
public function setTextColor(color:Color) {
nativ.setTextColor(color);
}
public function getBackgroundColor():Color {
return ColorConvert.ccToColor(nativ.getBackgroundColor());
return nativ.getBackgroundColor();
}
public function setBackgroundColor(color:Color) {
nativ.setBackgroundColor(ColorConvert.colorToCC(color));
nativ.setBackgroundColor(color);
}
public function isColor():Bool {

View File

@@ -158,8 +158,8 @@ class TermBuffer implements TermWriteable {
return currentTextColor;
}
public function setTextColor(colour:Color) {
currentTextColor = colour;
public function setTextColor(color:Color) {
currentTextColor = color;
}
public function getBackgroundColor():Color {

View File

@@ -31,12 +31,12 @@ interface TermWriteable {
public function clear():Void;
public function clearLine():Void;
public function getTextColor():Color;
public function setTextColor(colour:Color):Void;
public function setTextColor(color:Color):Void;
public function getBackgroundColor():Color;
public function setBackgroundColor(color:Color):Void;
public function isColor():Bool;
// public function setPaletteColor(...);
// public function getPaletteColor(colour);
// public function getPaletteColor(color);
/**
Clears the screen, resetes the courser to (0,0) and resetes the color to Black and White.

View File

@@ -150,12 +150,12 @@ class VirtualTermWriter implements TermWriteable extends TermBuffer {
return super.getTextColor();
}
public override function setTextColor(colour:Color) {
public override function setTextColor(color:Color) {
if (isEnabled()) {
target.setTextColor(colour);
target.setTextColor(color);
}
super.setTextColor(colour);
super.setTextColor(color);
}
public override function getBackgroundColor():Color {

View File

@@ -114,8 +114,8 @@ class WindowContext implements TermWriteable {
return writer.getTextColor();
}
public function setTextColor(colour:Color) {
writer.setTextColor(colour);
public function setTextColor(color:Color) {
writer.setTextColor(color);
}
public function getBackgroundColor():Color {