Skip to content

More liberal coloring policies #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

More liberal coloring policies #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2044307
Made TextBox colorable
Jul 26, 2017
229ce89
More liberal coloring policies.
Jul 26, 2017
adaf3e9
Merge branch 'master' of https://github.com/lollyde/ConsoleDraw
Jul 26, 2017
6b4bb13
freeest colour policies
Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/ConsoleDraw/Inputs/Button.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ public class Button : Input
{
private String Text;
public ConsoleColor BackgroundColour = ConsoleColor.Gray;
private ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor TextColour = ConsoleColor.Black;

private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
private ConsoleColor SelectedTextColour = ConsoleColor.White;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor SelectedTextColour = ConsoleColor.White;

private bool Selected = false;

Expand Down
6 changes: 3 additions & 3 deletions Source/ConsoleDraw/Inputs/CheckBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs
public class CheckBox : Input
{
public ConsoleColor BackgroundColour = ConsoleColor.Gray;
private ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor TextColour = ConsoleColor.Black;

private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
private ConsoleColor SelectedTextColour = ConsoleColor.White;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor SelectedTextColour = ConsoleColor.White;

private bool Selected = false;
public bool Checked = false;
Expand Down
8 changes: 4 additions & 4 deletions Source/ConsoleDraw/Inputs/Dropdown/Dropdown.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ namespace ConsoleDraw.Inputs
{
public class Dropdown : Input
{
private ConsoleColor TextColour = ConsoleColor.Black;
private ConsoleColor BackgroudColour = ConsoleColor.Gray;
private ConsoleColor SelectedTextColour = ConsoleColor.White;
private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor BackgroudColour = ConsoleColor.Gray;
public ConsoleColor SelectedTextColour = ConsoleColor.White;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;

private bool Selected = false;
public List<DropdownItem> DropdownItems = new List<DropdownItem>();
Expand Down
8 changes: 4 additions & 4 deletions Source/ConsoleDraw/Inputs/Dropdown/DropdownItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs
public class DropdownItem : Input
{
public String Text = "";
private ConsoleColor TextColour = ConsoleColor.White;
private ConsoleColor BackgroudColour = ConsoleColor.DarkGray;
private ConsoleColor SelectedTextColour = ConsoleColor.Black;
private ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray;
public ConsoleColor TextColour = ConsoleColor.White;
public ConsoleColor BackgroudColour = ConsoleColor.DarkGray;
public ConsoleColor SelectedTextColour = ConsoleColor.Black;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray;

private bool Selected = false;
public Action Action;
Expand Down
2 changes: 1 addition & 1 deletion Source/ConsoleDraw/Inputs/Label.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace ConsoleDraw.Inputs
public class Label : Input
{
private String Text = "";
private ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor BackgroundColour = ConsoleColor.Gray;

public Label(String text, int x, int y, String iD, Window parentWindow) : base(x, y, 1, text.Count(), parentWindow, iD)
Expand Down
8 changes: 4 additions & 4 deletions Source/ConsoleDraw/Inputs/Menu/Menu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs
public class Menu : Input
{
private String Text = "";
private ConsoleColor TextColour = ConsoleColor.Black;
private ConsoleColor BackgroudColour = ConsoleColor.Gray;
private ConsoleColor SelectedTextColour = ConsoleColor.White;
private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor BackgroudColour = ConsoleColor.Gray;
public ConsoleColor SelectedTextColour = ConsoleColor.White;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;

private bool Selected = false;
public List<MenuItem> MenuItems = new List<MenuItem>();
Expand Down
8 changes: 4 additions & 4 deletions Source/ConsoleDraw/Inputs/Menu/MenuItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs
public class MenuItem : Input
{
private String Text = "";
private ConsoleColor TextColour = ConsoleColor.White;
private ConsoleColor BackgroudColour = ConsoleColor.DarkGray;
private ConsoleColor SelectedTextColour = ConsoleColor.Black;
private ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray;
public ConsoleColor TextColour = ConsoleColor.White;
public ConsoleColor BackgroudColour = ConsoleColor.DarkGray;
public ConsoleColor SelectedTextColour = ConsoleColor.Black;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.Gray;

private bool Selected = false;
public Action Action;
Expand Down
6 changes: 3 additions & 3 deletions Source/ConsoleDraw/Inputs/RadioButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace ConsoleDraw.Inputs
public class RadioButton : Input
{
public ConsoleColor BackgroundColour = ConsoleColor.Gray;
private ConsoleColor TextColour = ConsoleColor.Black;
public ConsoleColor TextColour = ConsoleColor.Black;

private ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
private ConsoleColor SelectedTextColour = ConsoleColor.White;
public ConsoleColor SelectedBackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor SelectedTextColour = ConsoleColor.White;

private bool Selected = false;
public bool Checked = false;
Expand Down
2 changes: 1 addition & 1 deletion Source/ConsoleDraw/Inputs/TextArea.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private String Text {
}
private String TextWithoutNewLine { get { return RemoveNewLine(Text); } }

private ConsoleColor TextColour = ConsoleColor.White;
public ConsoleColor TextColour = ConsoleColor.White;
public ConsoleColor BackgroundColour = ConsoleColor.Blue;

private Cursor cursor = new Cursor();
Expand Down
4 changes: 2 additions & 2 deletions Source/ConsoleDraw/Inputs/TextBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public class TextBox : Input
private int Offset = 0;
private String Text = "";

private ConsoleColor TextColour = ConsoleColor.White;
private ConsoleColor BackgroundColour = ConsoleColor.DarkGray;
public ConsoleColor TextColour = ConsoleColor.White;
public ConsoleColor BackgroundColour = ConsoleColor.DarkGray;

private Cursor cursor = new Cursor();

Expand Down
5 changes: 3 additions & 2 deletions Source/ConsoleDraw/Windows/LoadMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public LoadMenu(String path, Dictionary<String, String> fileTypes, Window parent

CurrentlySelected = fileSelect;

UpdateFileTypeFilter();
Draw();
MainLoop();
}
Expand Down Expand Up @@ -86,8 +87,8 @@ private void LoadFile()
}

var file = Path.Combine(fileSelect.CurrentPath, fileSelect.CurrentlySelectedFile);
String text = System.IO.File.ReadAllText(file);

//String text = System.IO.File.ReadAllText(file);
String text = "";
/*var mainWindow = (MainWindow)ParentWindow;
mainWindow.textArea.SetText(text);
mainWindow.fileLabel.SetText(fileSelect.CurrentlySelectedFile);*/
Expand Down