PR ready branch

ctc-oss · Oct 6, 2023 · 3c216a2 · 3c216a2
1 parent c9beca1
commit 3c216a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/svelte/src/components/DataDisplays/Header/DisplayHeader.svelte b/src/svelte/src/components/DataDisplays/Header/DisplayHeader.svelte
@@ -40,7 +40,7 @@ limitations under the License.
   import { byteDivWidthFromRadix } from '../../../utilities/display'
 
   const eventDispatcher = createEventDispatcher()
-  const bitNumText = '01234567'
+  let bitIndexStr = '01234567'
   let selectionOffsetText: string
   let offsetLine: string[] = []
 
@@ -50,6 +50,7 @@ limitations under the License.
       $displayRadix,
       $bytesPerRow
     )
+    console.log(offsetLine)
   }
 
   $: selectionOffsetText = setSelectionOffsetInfo(
@@ -65,15 +66,15 @@ limitations under the License.
     displayRadix: RadixValues,
     bytesPerRow: BytesPerRow
   ) {
-    let ret = []
+    let ret: string[] = []
 
     if (displayRadix != RADIX_OPTIONS.Binary) {
       for (let i = 0; i < bytesPerRow; i++) {
         ret.push(i.toString(addressRadix).padStart(2, '0'))
       }
     } else {
-      for (let i = 0; i < 8; i++) {
-        ret.push(i.toString(10))
+      for (let i = 0; i < bytesPerRow; i++) {
+        ret.push(i.toString(addressRadix))
       }
     }
     return ret
@@ -134,7 +135,7 @@ limitations under the License.
         {#each offsetLine as offset}
           <div class="physical-addr-seg binary" style:min-width={byteDivWidthFromRadix($displayRadix)}>
             <div>{offset}</div>
-            <div>{bitNumText}</div>
+            <div>{bitIndexStr}</div>
           </div>
         {/each}
       {:else}
@@ -157,7 +158,7 @@ limitations under the License.
       {#each offsetLine as offset}
         <div 
           class="logical-addr-seg"
-          style:min-width={byteDivWidthFromRadix($displayRadix)}>{offset}</div>
+          style:min-width={byteDivWidthFromRadix(RADIX_OPTIONS.Hexadecimal)}>{offset}</div>
       {/each}
     </div>
   </div>

diff --git a/src/svelte/src/components/Header/fieldsets/Settings.svelte b/src/svelte/src/components/Header/fieldsets/Settings.svelte
@@ -30,7 +30,6 @@ limitations under the License.
   import { UIThemeCSSClass } from '../../../utilities/colorScheme'
   import ViewportVisibilityIcon from '../../Icons/ViewportVisibilityIcon.svelte'
 
-  $: $bytesPerRow = $displayRadix === RADIX_OPTIONS.Binary ? 8 : 16
 </script>
 
 <fieldset>

diff --git a/src/svelte/src/components/globalStyles.css b/src/svelte/src/components/globalStyles.css
@@ -317,8 +317,6 @@ div.hide-scrollbar::-webkit-scrollbar {
   display: flex;
   font-family: 'Red Hat Mono';
   height: 25pt;
-  /* border-width: 0 1px 1px 1px;
-  border-style: solid; */
 }
 .dataEditor div.measure.dark {
   display: flex;