Merge branch 'develop' into move-navbar

Author: rongxin-liu

compare50/_renderer/static/match.css

@@ -176,6 +176,12 @@ a.index-link:hover {
     left: 110%;
 }
 
+.sub_name {
+    display: inline-block;
+    vertical-align: top;
+    white-space: nowrap;
+}
+
 .score_tooltip:hover .tooltiptext {
     visibility: visible;
 }

compare50/_renderer/static/match.js

@@ -262,7 +262,7 @@ function init_group_button(groups, view_name) {
     document.addEventListener("keyup", (event) =>  {
         if (event.key === ' ' || event.key == "]") {
             event.preventDefault();
-            go_to_adjacent_group(event, 1); 
+            go_to_adjacent_group(event, 1);
         }
     });
 
@@ -425,12 +425,16 @@ function select_view(name) {
     select_view._cache[CURRENT_VIEW] = true;
 }
 
-
 function make_split(name) {
     return Split([`#${name}left`,`#${name}right`], {
         elementStyle: function (dimension, size, gutterSize) {
-            window.dispatchEvent(new Event('resize'));
-            return {'flex-basis': 'calc(' + size + '% - ' + gutterSize + 'px)'}
+            requestAnimationFrame(() => {
+                document.getElementById(`${name}left_header`).style.width =
+                    document.getElementById(`${name}left`).offsetWidth + 'px';
+                document.getElementById(`${name}right_header`).style.width =
+                    document.getElementById(`${name}right`).offsetWidth + 'px';
+            });
+            return { 'flex-basis': 'calc(' + size + '% - ' + gutterSize + 'px)' };
         },
         gutterStyle: function (dimension, gutterSize) { return {'flex-basis':  gutterSize + 'px'} },
         sizes: [50, 50],
@@ -440,7 +444,6 @@ function make_split(name) {
     });
 }
 
-
 document.addEventListener("DOMContentLoaded", event => {
     let id = parseInt(document.getElementsByClassName("id")[0].id);
 

compare50/_renderer/templates/match.html

@@ -1,9 +1,7 @@
-
-
 <div id="{{name}}" class="container-fluid h-100 view {{name}}">
-    <div class="row sticky-top bg-dark text-light" id="{{name}}sub_names">
-        {% for sub in sub_a, sub_b %}
-            <div class="col-sm-6 col-2 sub_name">
+    <div class="row sticky-top bg-dark text-light">
+        {% for sub, side in (sub_a, "left"), (sub_b, "right") %}
+            <div class="sub_name" id="{{name}}{{side}}_header">
                 <h5 title="{{sub.path}}">{{sub.name}} ({{sub.percentage}}%)</h5>
             </div>
         {% endfor %}

setup.py

@@ -12,7 +12,7 @@
     license="GPLv3",
     description="This is compare50, with which you can compare files for similarities.",
     long_description="This is compare50, with which you can compare files for similarities.",
-    install_requires=["attrs>=18,<21", "intervaltree>=3,<4", "lib50>=2,<4", "numpy>=1.15,<2", "pygments>=2.2,<3", "jinja2>=3,<4", "termcolor>=1.1.0,<2", "tqdm>=4.32,<5", "importlib", "names"],
+    install_requires=["attrs>=18,<21", "intervaltree>=3,<4", "lib50>=2,<4", "numpy>=2,<3", "pygments>=2.2,<3", "jinja2>=3,<4", "termcolor>=1.1.0,<2", "tqdm>=4.32,<5", "names"],
     extras_require = {
         "develop": ["sphinx", "sphinx_rtd_theme", "sphinx-autobuild", "line_profiler"]
     },
@@ -22,6 +22,6 @@
     packages=find_packages(exclude=["tests"]),
     scripts=["bin/compare50"],
     url="https://github.com/cs50/compare50",
-    version="1.2.13",
+    version="1.2.14",
     include_package_data=True,
 )