Эх сурвалжийг харах

Added wip properties view

tobychui 2 жил өмнө
parent
commit
1a04012221

+ 20 - 7
web/SystemAO/file_system/file_explorer.css

@@ -59,17 +59,12 @@ body{
     see subparts for more detail configs
 */
 .navibar{
-    position:fixed;
     width:100%;
     padding-left:12px;
     padding-right:12px;
     padding-top:6px;
     padding-bottom:3px;
     z-index: 99;
-}
-
-.navibar{
-    /*box-shadow: 0 2px 4px 2px rgb(224, 224, 224);*/
     background-color:var(--navi_bgcolor);
     border-bottom:2px solid var(--navi_theme);
 }
@@ -241,6 +236,14 @@ body{
     
 }
 
+/*
+    Main Window scalling 
+*/
+#mainWindow{
+    display: flex;
+    align-items:flex-start;
+}
+
 /*
     Directory Sidebar
 */
@@ -252,7 +255,7 @@ body{
     border-right:2px solid rgba(219, 226, 241, 0.7);
     background-color:#f5f5f5;
     color:rgb(44, 44, 44);
-    position:absolute;
+    width: 250px;
 }
 
 
@@ -309,7 +312,7 @@ body{
     Folder Viewer (Main viewer)
 */
 #folderView{
-    position:absolute;
+    flex-grow:1;
     padding-left:2em;
     padding-right:2em;
     padding-top:2em;
@@ -474,6 +477,16 @@ body{
     opacity: 0.5;
 }
 
+/*
+
+    Properties View
+
+*/
+
+#propertiesView{
+    width: 300px;
+}
+
 
 /*
     Context Menu

+ 14 - 3
web/SystemAO/file_system/file_explorer.html

@@ -142,6 +142,9 @@
                 </div>
                 <br>
             </div>
+            <div id="propertiesView">
+                <iframe src="file_properties.html" style="border: 1px solid red; width: 100%; height: 100vh;"></iframe>
+            </div>
         </div>
         <!-- Other popup windows -->
         <div class="popupWrapper"></div>
@@ -3567,10 +3570,16 @@
                 if (isMobile){
                     $("#directorySidebar").stop().finish().animate({left: "toggle"},200);
                 }else{
-                    if ($("#directorySidebar").offset().left < 0){
-                        $("#directorySidebar").stop().finish().animate({left: 0},200);
+                    if ($("#directorySidebar").is(":visible")){
+                        $("#directorySidebar").transition("slide right out", function(){
+                            $("#directorySidebar").hide();
+                        });
+                        //$("#directorySidebar").stop().finish().animate({left: 0},200);
                     }else{
-                        $("#directorySidebar").stop().finish().animate({left: -1 * directorySidebarWidth},200);
+                        $("#directorySidebar").transition("slide right in", function(){
+                            $("#directorySidebar").show();
+                        });
+                        //$("#directorySidebar").stop().finish().animate({left: -1 * directorySidebarWidth},200);
                     }
                 }
                
@@ -3591,6 +3600,7 @@
                     $("#directorySidebar").css("height",windowHeight + "px");
                     //Resize the file viewer
                     $("#folderView").css("top",h);
+                    /*
                     if (window.innerWidth > 650){
                         if (animate){
                             $("#folderView").stop().finish().animate({
@@ -3617,6 +3627,7 @@
                             });
                         }
                     }
+                    */
                    
                     if (isChromium){
                         //$("#mainWindow").css("height", window.innerWidth);