From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index c1fb7ac..0f3a706 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -83,24 +83,7 @@
                         btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
                         MusicFragment();
                         break;
-                    case FunctionCategory.Scene:
-                        btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
-                        if ((function as Scene).sceneType == SceneType.MovieScene)
-                        {
-                            var movieIcon = new Button()
-                            {
-                                X = Application.GetRealWidth(52),
-                                Y = Application.GetRealHeight(14),
-                                Width = Application.GetRealWidth(16),
-                                Height = Application.GetRealWidth(16),
-                                UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
-                            };
-                            bodyDiv.AddChidren(movieIcon);
-                            btnName.X = Application.GetRealWidth(52 + 16);
-                        }
-                        //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
-                        LoadEvent_ControlScene();
-                        break;
+
                 }
             }
             else
@@ -243,7 +226,7 @@
                 Height = Application.GetMinRealAverage(40),
                 SelectedImagePath = "Collection/CollectionIcon.png",
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = function.collection
+                IsSelected = function.collect
             };
             bodyDiv.AddChidren(btnCollectionIcon);
         }
@@ -262,7 +245,7 @@
                     {
                         X = Application.GetRealWidth(14),
                         Y = Application.GetRealHeight(85),
-                        Width = Application.GetRealWidth(22),
+                        Width = Application.GetRealWidth(30),
                         Height = Application.GetRealHeight(21),
                         Text = "0%",
                         TextAlignment = TextAlignment.CenterLeft,
@@ -294,7 +277,7 @@
                     {
                         X = Application.GetRealWidth(14 + 22+180),
                         Y = Application.GetRealHeight(85),
-                        Width = Application.GetRealWidth(35),
+                        Width = Application.GetRealWidth(45),
                         Height = Application.GetRealHeight(21),
                         Text = "100%",
                         TextAlignment = TextAlignment.CenterLeft,

--
Gitblit v1.8.0