improve:浮动栏按钮UI
优化按钮显示
This commit is contained in:
@@ -2894,23 +2894,67 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
public void UpdateFloatingBarIcons()
|
public void UpdateFloatingBarIcons()
|
||||||
{
|
{
|
||||||
|
string currentMode = GetCurrentSelectedMode();
|
||||||
|
|
||||||
|
bool isCursorSolid = currentMode == "cursor";
|
||||||
|
bool isPenSolid = currentMode == "pen" || currentMode == "color";
|
||||||
|
bool isCircleEraserSolid = currentMode == "eraser";
|
||||||
|
bool isStrokeEraserSolid = currentMode == "eraserByStrokes";
|
||||||
|
bool isLassoSolid = currentMode == "select";
|
||||||
|
|
||||||
if (Settings.Appearance.UseLegacyFloatingBarUI)
|
if (Settings.Appearance.UseLegacyFloatingBarUI)
|
||||||
{
|
{
|
||||||
// 使用老版图标
|
CursorIconGeometry.Geometry = Geometry.Parse(
|
||||||
CursorIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LegacyLinedCursorIcon);
|
isCursorSolid
|
||||||
PenIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LegacyLinedPenIcon);
|
? XamlGraphicsIconGeometries.LegacySolidCursorIcon
|
||||||
StrokeEraserIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LegacyLinedEraserStrokeIcon);
|
: XamlGraphicsIconGeometries.LegacyLinedCursorIcon);
|
||||||
CircleEraserIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LegacyLinedEraserCircleIcon);
|
|
||||||
LassoSelectIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LegacyLinedLassoSelectIcon);
|
PenIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isPenSolid
|
||||||
|
? XamlGraphicsIconGeometries.LegacySolidPenIcon
|
||||||
|
: XamlGraphicsIconGeometries.LegacyLinedPenIcon);
|
||||||
|
|
||||||
|
StrokeEraserIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isStrokeEraserSolid
|
||||||
|
? XamlGraphicsIconGeometries.LegacySolidEraserStrokeIcon
|
||||||
|
: XamlGraphicsIconGeometries.LegacyLinedEraserStrokeIcon);
|
||||||
|
|
||||||
|
CircleEraserIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isCircleEraserSolid
|
||||||
|
? XamlGraphicsIconGeometries.LegacySolidEraserCircleIcon
|
||||||
|
: XamlGraphicsIconGeometries.LegacyLinedEraserCircleIcon);
|
||||||
|
|
||||||
|
LassoSelectIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isLassoSolid
|
||||||
|
? XamlGraphicsIconGeometries.LegacySolidLassoSelectIcon
|
||||||
|
: XamlGraphicsIconGeometries.LegacyLinedLassoSelectIcon);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 使用新版图标
|
CursorIconGeometry.Geometry = Geometry.Parse(
|
||||||
CursorIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedCursorIcon);
|
isCursorSolid
|
||||||
PenIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedPenIcon);
|
? XamlGraphicsIconGeometries.SolidCursorIcon
|
||||||
StrokeEraserIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedEraserStrokeIcon);
|
: XamlGraphicsIconGeometries.LinedCursorIcon);
|
||||||
CircleEraserIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedEraserCircleIcon);
|
|
||||||
LassoSelectIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedLassoSelectIcon);
|
PenIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isPenSolid
|
||||||
|
? XamlGraphicsIconGeometries.SolidPenIcon
|
||||||
|
: XamlGraphicsIconGeometries.LinedPenIcon);
|
||||||
|
|
||||||
|
StrokeEraserIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isStrokeEraserSolid
|
||||||
|
? XamlGraphicsIconGeometries.SolidEraserStrokeIcon
|
||||||
|
: XamlGraphicsIconGeometries.LinedEraserStrokeIcon);
|
||||||
|
|
||||||
|
CircleEraserIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isCircleEraserSolid
|
||||||
|
? XamlGraphicsIconGeometries.SolidEraserCircleIcon
|
||||||
|
: XamlGraphicsIconGeometries.LinedEraserCircleIcon);
|
||||||
|
|
||||||
|
LassoSelectIconGeometry.Geometry = Geometry.Parse(
|
||||||
|
isLassoSolid
|
||||||
|
? XamlGraphicsIconGeometries.SolidLassoSelectIcon
|
||||||
|
: XamlGraphicsIconGeometries.LinedLassoSelectIcon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user