ASTDiff GUI: Fix the scrolling issues

Further fix for tsantalis#672
pouryafard75 · Aug 24, 2024 · 6008038 · 6008038
1 parent ef343a6
commit 6008038
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/gui/webdiff/dir/DirectoryDiffView.java b/src/main/java/gui/webdiff/dir/DirectoryDiffView.java
@@ -60,7 +60,7 @@ public void renderOn(HtmlCanvas html) throws IOException {
                 ._if()
                 .div(class_("row mt-3 mb-3"))
                         .div(class_("col"))
-                            .div(class_("card"))
+                            .div(class_("card").style("padding: 5px"))
                                 .div(class_("card-header"))
                                     .h4(class_("card-title mb-0"))
                                         .write("Modified files ")

diff --git a/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java b/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java
@@ -30,7 +30,7 @@ public void renderOn(HtmlCanvas html) {
                     html.render(DocType.HTML5)
                     .html(lang("en"))
                     .body()
-                    .div(class_("container-fluid"))
+                    .div(class_("container-fluid").style("padding-left: 0"))
                     .div(class_("row h-100"))
                     .div(class_("col-2 bg-light dir-diff"))
                     .render(new DirectoryDiffView(comparator, true))
@@ -61,7 +61,7 @@ public void renderOn(HtmlCanvas html) {
                         ._div()
                         ._div()
                         .div(id("collapse-" + i).class_("collapse show").add("aria-labelledby", "heading-" + i))
-                        .div(class_("card-body").style("padding: 0;"));
+                        .div(class_("card-body").style("overflow: hidden; padding: 0;"));
                 makeEachDiff(html, i, core);
                 html
                         ._div()

diff --git a/src/main/resources/web/dist/monaco.css b/src/main/resources/web/dist/monaco.css
@@ -100,7 +100,6 @@ div {
 }
 
 #diff_panel {
-	overflow-y: auto;
 	height: 100%;
 }
 /*.deleted {*/

diff --git a/src/main/resources/web/dist/monaco.js b/src/main/resources/web/dist/monaco.js
@@ -8,7 +8,8 @@ function getEditorOptions(config, text) {
         lineDecorationsWidth: 0,
         glyphMargin: false,
         scrollbar: {
-            alwaysConsumeMouseWheel: false
+            alwaysConsumeMouseWheel: false,
+            vertical: config.spv === true ? 'hidden' : 'auto'
         },
         minimap: {
             enabled: false,

diff --git a/src/main/resources/web/dist/single.css b/src/main/resources/web/dist/single.css
@@ -1,10 +1,17 @@
 .monaco-panel {
-    overflow-y: auto; /* Enable scrollbar for Monaco panel */
+    overflow: hidden; /* Disable both vertical and horizontal scrollbars */
+
     height: 100%; /* Ensure it fills the available height */
 }
+.dir-diff{
+    height: 100%;
+    overflow-y: scroll; /* Enable vertical scrolling */
+    overflow-x: hidden; /* Disable horizontal scrolling */
+}
 
 #accordion {
-    overflow-y: auto; /* Enable scrollbar for accordion */
+    overflow-y: scroll; /* Enable vertical scrolling */
+    overflow-x: hidden; /* Disable horizontal scrolling */
     height: 100%; /* Ensure it fills the available height */
 }
 

diff --git a/src/main/resources/web/dist/single.js b/src/main/resources/web/dist/single.js
@@ -1,4 +1,3 @@
-x = 1;
 $(document).ready(function() {
     // Select all elements with an ID that starts with 'diff_row_'
     $('[id^="diff_row_"]').each(function() {
@@ -11,7 +10,6 @@ $(document).ready(function() {
             event.preventDefault(); // Prevent the default anchor behavior
             var targetId = 'heading-' + id.split('_')[2];
             var $target = $('#' + targetId);
-            x = $target
             var targetOffset = $('#' + targetId).offset().top;
             var accordionOffset = $('#accordion').offset().top;
             var scrollTo = targetOffset - accordionOffset + $('#accordion').scrollTop();