- ensure gallery viewer has view icon
- ensure view icon is above video thumbnail
This commit is contained in:
@@ -319,19 +319,6 @@
|
|||||||
</a>
|
</a>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- View Asset while selecting -->
|
|
||||||
{#if mouseOver && selectionActive}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onclick={onViewerIconClickedHandler}
|
|
||||||
class={['absolute focus:outline-none bottom-2 end-2', { 'cursor-not-allowed': disabled }]}
|
|
||||||
tabindex={-1}
|
|
||||||
{disabled}
|
|
||||||
>
|
|
||||||
<Icon path={mdiMagnifyPlusOutline} size="24" class="text-white/80 hover:text-white" />
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<ImageThumbnail
|
<ImageThumbnail
|
||||||
class={imageClass}
|
class={imageClass}
|
||||||
{brokenAssetClass}
|
{brokenAssetClass}
|
||||||
@@ -366,6 +353,19 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- View Asset while selecting -->
|
||||||
|
{#if mouseOver && selectionActive}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onclick={onViewerIconClickedHandler}
|
||||||
|
class={['absolute focus:outline-none bottom-2 end-2', { 'cursor-not-allowed': disabled }]}
|
||||||
|
tabindex={-1}
|
||||||
|
{disabled}
|
||||||
|
>
|
||||||
|
<Icon path={mdiMagnifyPlusOutline} size="24" class="text-white/80 hover:text-white" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{#if (!loaded || thumbError) && asset.thumbhash}
|
{#if (!loaded || thumbError) && asset.thumbhash}
|
||||||
<canvas
|
<canvas
|
||||||
use:thumbhash={{ base64ThumbHash: asset.thumbhash }}
|
use:thumbhash={{ base64ThumbHash: asset.thumbhash }}
|
||||||
|
|||||||
@@ -494,8 +494,8 @@
|
|||||||
>
|
>
|
||||||
<Thumbnail
|
<Thumbnail
|
||||||
readonly={disableAssetSelect}
|
readonly={disableAssetSelect}
|
||||||
onClick={() => {
|
onClick={(asset, forceView: boolean = false) => {
|
||||||
if (assetInteraction.selectionActive) {
|
if (assetInteraction.selectionActive && !forceView) {
|
||||||
handleSelectAssets(toTimelineAsset(currentAsset));
|
handleSelectAssets(toTimelineAsset(currentAsset));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -507,6 +507,7 @@
|
|||||||
asset={toTimelineAsset(currentAsset)}
|
asset={toTimelineAsset(currentAsset)}
|
||||||
selected={assetInteraction.hasSelectedAsset(currentAsset.id)}
|
selected={assetInteraction.hasSelectedAsset(currentAsset.id)}
|
||||||
selectionCandidate={assetInteraction.hasSelectionCandidate(currentAsset.id)}
|
selectionCandidate={assetInteraction.hasSelectionCandidate(currentAsset.id)}
|
||||||
|
selectionActive={assetInteraction.selectionActive}
|
||||||
thumbnailWidth={layout.width}
|
thumbnailWidth={layout.width}
|
||||||
thumbnailHeight={layout.height}
|
thumbnailHeight={layout.height}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user