From a695cb742e2510490c5db67bd31fb63138d4d5f2 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Fri, 17 May 2019 20:21:48 +0900 Subject: [PATCH] =?utf8?q?ColumnColors=E3=81=AE=E6=8A=BD=E8=B1=A1=E5=BA=A6?= =?utf8?q?=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/MainForm.cs | 2 +- KancolleSniffer/View/AntiAirPanel.cs | 4 ++-- KancolleSniffer/View/BattleResultPanel.cs | 6 ++--- KancolleSniffer/View/CustomColors.cs | 26 +++++++++++++++++++++- KancolleSniffer/View/FleetPanel.cs | 4 ++-- KancolleSniffer/View/MainFormLabels.cs | 10 ++++----- KancolleSniffer/View/RepairListForMain.cs | 4 ++-- KancolleSniffer/View/ShipLabel.cs | 1 - .../View/ShipListPanel/GroupConfigLabels.cs | 4 ++-- .../View/ShipListPanel/RepairListLabels.cs | 4 ++-- .../View/ShipListPanel/ShipListLabels.cs | 4 ++-- 11 files changed, 46 insertions(+), 23 deletions(-) diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs index 805f09c..421c3fd 100644 --- a/KancolleSniffer/MainForm.cs +++ b/KancolleSniffer/MainForm.cs @@ -84,7 +84,7 @@ namespace KancolleSniffer SetupFleetClick(); CreateMainLabels(); CreateNumberAndHistory(manager); - labelPresetAkashiTimer.BackColor = ShipLabel.ColumnColors[1]; + labelPresetAkashiTimer.BackColor = CustomColors.ColumnColors.Bright; SetupQuestPanel(); panelRepairList.CreateLabels(panelRepairList_Click); PerformZoom(); diff --git a/KancolleSniffer/View/AntiAirPanel.cs b/KancolleSniffer/View/AntiAirPanel.cs index 4a7f2ac..b2e860e 100644 --- a/KancolleSniffer/View/AntiAirPanel.cs +++ b/KancolleSniffer/View/AntiAirPanel.cs @@ -94,7 +94,7 @@ namespace KancolleSniffer.View { Location = new Point(0, y), Size = new Size(ListForm.PanelWidth, LineHeight), - BackColor = ShipLabel.ColumnColors[(i + 1) % 2], + BackColor = CustomColors.ColumnColors.BrightFirst(i), Visible = false }; Scaler.Scale(lbp); @@ -114,7 +114,7 @@ namespace KancolleSniffer.View foreach (var label in labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); } } diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs index 47531b1..3ad38fb 100644 --- a/KancolleSniffer/View/BattleResultPanel.cs +++ b/KancolleSniffer/View/BattleResultPanel.cs @@ -336,7 +336,7 @@ namespace KancolleSniffer.View { Location = new Point(0, y), Size = new Size(0, LineHeight), - BackColor = ShipLabel.ColumnColors[i % 2], + BackColor = CustomColors.ColumnColors.DarkFirst(i), Visible = false, Tag = y }; @@ -373,7 +373,7 @@ namespace KancolleSniffer.View foreach (var label in friend.Concat(enemy)) { panel.Controls.Add(label); - label.BackColor = ShipLabel.ColumnColors[i % 2]; + label.BackColor = CustomColors.ColumnColors.DarkFirst(i); } Controls.Add(panel); } @@ -440,7 +440,7 @@ namespace KancolleSniffer.View } }); // ReSharper disable once VirtualMemberCallInConstructor - BackColor = ShipLabel.ColumnColors[1]; + BackColor = CustomColors.ColumnColors.Bright; } public void SetInformation(BattleInfo battleInfo) diff --git a/KancolleSniffer/View/CustomColors.cs b/KancolleSniffer/View/CustomColors.cs index f6370f1..46ceac5 100644 --- a/KancolleSniffer/View/CustomColors.cs +++ b/KancolleSniffer/View/CustomColors.cs @@ -1,9 +1,33 @@ -using System.Drawing; +// Copyright (C) 2019 Kazuhiro Fujieda +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System.Drawing; namespace KancolleSniffer.View { public static class CustomColors { public static Color ActiveButtonColor = Color.FromArgb(152, 179, 208); + + public class ColumnColors + { + public static readonly Color Bright = Color.White; + private static readonly Color Dark = SystemColors.Control; + private static readonly Color[] Colors = {Bright, Dark}; + + public static Color BrightFirst(int i) => Colors[i % 2]; + public static Color DarkFirst(int i) => Colors[(i + 1) % 2]; + } } } \ No newline at end of file diff --git a/KancolleSniffer/View/FleetPanel.cs b/KancolleSniffer/View/FleetPanel.cs index 55fafd3..062f32b 100644 --- a/KancolleSniffer/View/FleetPanel.cs +++ b/KancolleSniffer/View/FleetPanel.cs @@ -300,7 +300,7 @@ namespace KancolleSniffer.View { Location = new Point(0, y), Size = new Size(ListForm.PanelWidth, LineHeight), - BackColor = ShipLabel.ColumnColors[(i + 1) % 2], + BackColor = CustomColors.ColumnColors.BrightFirst(i), Visible = false }; Scaler.Scale(lbp); @@ -320,7 +320,7 @@ namespace KancolleSniffer.View foreach (var label in labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); } } diff --git a/KancolleSniffer/View/MainFormLabels.cs b/KancolleSniffer/View/MainFormLabels.cs index ca7c8a1..03c21e2 100644 --- a/KancolleSniffer/View/MainFormLabels.cs +++ b/KancolleSniffer/View/MainFormLabels.cs @@ -105,7 +105,7 @@ namespace KancolleSniffer.View foreach (var label in headings) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[1]; + label.BackColor = CustomColors.ColumnColors.Bright; } for (var i = 0; i < shipLabels.Length; i++) { @@ -145,7 +145,7 @@ namespace KancolleSniffer.View foreach (var label in shipLabels[i]) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[i % 2]; + label.BackColor = CustomColors.ColumnColors.DarkFirst(i); label.Tag = i; label.Click += onClick; } @@ -206,7 +206,7 @@ namespace KancolleSniffer.View foreach (var label in headings) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[1]; + label.BackColor = CustomColors.ColumnColors.Bright; } for (var i = 0; i < _combinedLabels.Length; i++) { @@ -235,7 +235,7 @@ namespace KancolleSniffer.View foreach (var label in _combinedLabels[i]) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[i % 2]; + label.BackColor = CustomColors.ColumnColors.DarkFirst(i); label.Tag = i; label.Click += onClick; } @@ -289,7 +289,7 @@ namespace KancolleSniffer.View Size = new Size(31, 12), TextAlign = ContentAlignment.TopRight }); - label.BackColor = ShipLabel.ColumnColors[i % 2]; + label.BackColor = CustomColors.ColumnColors.DarkFirst(i); } foreach (var label in timerLabels) Scaler.Scale(label); diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs index 8c50e6d..c93557a 100644 --- a/KancolleSniffer/View/RepairListForMain.cs +++ b/KancolleSniffer/View/RepairListForMain.cs @@ -65,7 +65,7 @@ namespace KancolleSniffer.View foreach (var label in _repairLabels[i].Labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); label.Click += onClick; } } @@ -137,7 +137,7 @@ namespace KancolleSniffer.View labels.Fleet.Text = ""; labels.Name.SetName(""); labels.Time.Text = ""; - labels.Damage.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + labels.Damage.BackColor = CustomColors.ColumnColors.BrightFirst(i); } } } \ No newline at end of file diff --git a/KancolleSniffer/View/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs index b9a0f2a..66e561e 100644 --- a/KancolleSniffer/View/ShipLabel.cs +++ b/KancolleSniffer/View/ShipLabel.cs @@ -26,7 +26,6 @@ namespace KancolleSniffer.View [DesignerCategory("Code")] public class ShipLabel : Label { - public static Color[] ColumnColors = {SystemColors.Control, Color.White}; public static Font LatinFont { get; set; } = new Font("Tahoma", 8f); public bool AnchorRight { get; set; } private Color _initialBackColor; diff --git a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs index b502f12..96eadfc 100644 --- a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs +++ b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs @@ -46,7 +46,7 @@ namespace KancolleSniffer.View.ShipListPanel { Location = new Point(0, y), Size = new Size(ListForm.PanelWidth, ShipListPanel.LineHeight), - BackColor = ShipLabel.ColumnColors[(i + 1) % 2] + BackColor = CustomColors.ColumnColors.BrightFirst(i) }; Scaler.Scale(panel); panel.Tag = panel.Location.Y; @@ -85,7 +85,7 @@ namespace KancolleSniffer.View.ShipListPanel foreach (var label in labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); } } diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs index 53a6d67..092bca3 100644 --- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs +++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs @@ -37,7 +37,7 @@ namespace KancolleSniffer.View.ShipListPanel { Location = new Point(0, y), Size = new Size(ListForm.PanelWidth, ShipListPanel.LineHeight), - BackColor = ShipLabel.ColumnColors[(i + 1) % 2] + BackColor = CustomColors.ColumnColors.BrightFirst(i) }; Scaler.Scale(panel); panel.Tag = panel.Location.Y; @@ -72,7 +72,7 @@ namespace KancolleSniffer.View.ShipListPanel foreach (var label in labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); } _shipListPanel.SetHpPercent(labels[0]); } diff --git a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs index 8bf004f..ce7a4e0 100644 --- a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs +++ b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs @@ -37,7 +37,7 @@ namespace KancolleSniffer.View.ShipListPanel { Location = new Point(0, y), Size = new Size(ListForm.PanelWidth, ShipListPanel.LineHeight), - BackColor = ShipLabel.ColumnColors[(i + 1) % 2] + BackColor = CustomColors.ColumnColors.BrightFirst(i) }; Scaler.Scale(panel); var labels = new[] @@ -81,7 +81,7 @@ namespace KancolleSniffer.View.ShipListPanel foreach (var label in labels) { Scaler.Scale(label); - label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2]; + label.BackColor = CustomColors.ColumnColors.BrightFirst(i); } _shipListPanel.SetHpPercent(labels[0]); } -- 2.11.0