diff --git a/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.scss b/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.scss index 5af3e719..ca9689a3 100644 --- a/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.scss +++ b/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.scss @@ -61,19 +61,20 @@ } .addon-title { - white-space: normal; - text-decoration: none; - word-break: break-word; + display: -webkit-box; font-size: 16px; line-height: 16px; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; overflow: hidden; + text-decoration: none; + white-space: normal; + word-break: break-word; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; &:hover { cursor: pointer; text-decoration: underline; + color: var(--text-2); } &.text-warning:hover { diff --git a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.html b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.html index 117244f3..6ad25bcd 100644 --- a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.html +++ b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.html @@ -3,7 +3,7 @@
-
+
{{ addon.name }}
- {{ addon | getAddonListItemFileProp: "version":channel }} + + {{ addon | getAddonListItemFileProp: "version":channel }} +
diff --git a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.scss b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.scss index 6382f90c..86cedc8d 100644 --- a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.scss +++ b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.scss @@ -54,15 +54,24 @@ } } + .addon-text { + display: flex; + flex-direction: column; + justify-content: space-between; + min-height: 40px; + overflow: hidden; + } + .addon-title { - white-space: normal; - text-decoration: none; + display: -webkit-box; font-size: 16px; line-height: 16px; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; overflow: hidden; + text-decoration: none; + white-space: normal; + word-break: break-word; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; &:hover { cursor: pointer; @@ -75,8 +84,9 @@ color: var(--text-2); font-size: 14px; line-height: 14px; - display: flex; - flex-direction: row; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .dependency-icon { diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts index b670e4d3..8909f930 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts @@ -13,7 +13,7 @@ import { import * as _ from "lodash"; import { join } from "path"; import { from, Observable, of, Subject, Subscription, zip } from "rxjs"; -import { catchError, debounceTime, first, map, switchMap, tap } from "rxjs/operators"; +import { catchError, debounceTime, delay, first, map, switchMap, tap } from "rxjs/operators"; import { Overlay, OverlayRef } from "@angular/cdk/overlay"; import { AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from "@angular/core"; @@ -330,12 +330,20 @@ export class MyAddonsComponent implements OnInit, OnDestroy, AfterViewInit { } this.setPageContextText(); - this.lazyLoad() - .then(() => { - this.redrawRows(); - }) - .catch((e) => console.error(e)); - // window.setTimeout(() => {}, 50); + + from(this.lazyLoad()) + .pipe( + first(), + delay(400), + map(() => { + this.redrawRows(); + }), + catchError((e) => { + console.error(e); + return of(undefined); + }) + ) + .subscribe(); }; // Get the translated value of the provider name (unknown)