Revert "Неудачный коммит"

This reverts commit 565d0f15cc.
This commit is contained in:
2024-12-14 10:20:52 +04:00
parent 565d0f15cc
commit 2d28599940
6 changed files with 18 additions and 267 deletions

View File

@@ -10,9 +10,9 @@ namespace laba3.Core
/// <summary>
/// TUI menu;
/// </summary>
public class Menu
internal class Menu
{
private List<MenuOption> options;
private List<Option> options;
private int selected;
private string title;
@@ -23,21 +23,9 @@ namespace laba3.Core
public Menu(string title)
{
this.title = title;
this.options = new List<MenuOption> { };
this.options = new List<Option> { };
}
/// <summary>
/// Get options list
/// </summary>
/// <returns></returns>
public List<MenuOption> GetOptions() { return this.options; }
/// <summary>
/// Get title string
/// </summary>
/// <returns></returns>
public string GetTitle() { return this.title; }
/// <summary>
/// Add option to menu;
/// </summary>
@@ -45,7 +33,7 @@ namespace laba3.Core
/// <param name="action">Action, runs if option selected</param>
public void AddOption(string name, Action action)
{
this.options.Add(new MenuOption(name, action));
this.options.Add(new Option(name, action));
}
/// <summary>
@@ -89,7 +77,7 @@ namespace laba3.Core
Console.Clear();
Console.WriteLine(title);
int optionIndex = 0;
foreach (MenuOption option in options)
foreach (Option option in options)
{
string pointer = optionIndex == selected ? " ->" : " ";
Console.WriteLine($"{pointer}{option.Name}");
@@ -97,15 +85,12 @@ namespace laba3.Core
}
}
/// <summary>
/// Menu option struct;
/// </summary>
public struct MenuOption
private struct Option
{
public string Name { get; }
public Action Action { get; }
public MenuOption(string name, Action action)
public Option(string name, Action action)
{
Name = name;
Action = action;

View File

@@ -1,20 +1,12 @@
using laba3.Core;
using laba3.Subprograms;
using ProgLab1.GUI;
using System;
using System.Windows.Forms;
using static System.Windows.Forms.DataFormats;
class Program
{
[STAThread] // Требуется для Windows Forms
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Menu mainForm = new Menu();
laba3.Core.Menu mainMenu = new laba3.Core.Menu("Select option");
Menu mainMenu = new Menu("Select option");
mainMenu.AddOption("Guess answer math game", () => GuessAnswerMath.RunGame());
mainMenu.AddOption("About me", () => PrintAboutMe());
mainMenu.AddOption("Array sort", () => new ArraySortDemo().Run());
@@ -22,13 +14,13 @@ class Program
int sizex = 0;
int sizey = 0;
SnakeGame.Level difficulty = 0;
laba3.Core.Menu sizeMenu = new laba3.Core.Menu("Select world size");
Menu sizeMenu = new Menu("Select world size");
sizeMenu.AddOption("Small size (10x10)", () => { sizex = 10; sizey = 10; });
sizeMenu.AddOption("Medium size (20x20)", () => { sizex = 20; sizey = 20; });
sizeMenu.AddOption("Big size (40x20)", () => { sizex = 40; sizey = 20; });
sizeMenu.RunMenu();
laba3.Core.Menu difficultyMenu = new laba3.Core.Menu("Select difficulty");
Menu difficultyMenu = new Menu("Select difficulty");
difficultyMenu.AddOption("Easy", () => { difficulty = SnakeGame.Level.Low; });
difficultyMenu.AddOption("Medium", () => { difficulty = SnakeGame.Level.Medium; });
difficultyMenu.AddOption("Hard", () => { difficulty = SnakeGame.Level.High; });
@@ -45,16 +37,13 @@ class Program
Utils.Arrays withOneParam = new Utils.Arrays(10);
Utils.Arrays withTwoParams = new Utils.Arrays(10, 100);
laba3.Core.Menu test = new laba3.Core.Menu("test");
test.AddOption("a", () => { });
mainForm.AddMenu(mainMenu);
mainForm.AddMenu(mainMenu);
mainForm.AddMenu(mainMenu);
Application.Run(mainForm);
while (true)
{
mainMenu.RunMenu();
Console.WriteLine("Press Enter to continue");
while (Console.ReadKey().Key != ConsoleKey.Enter) { }
Console.Clear();
}
}
private static void PrintAboutMe()