Skip to content

feat: reduce image mode footprint by making the osc compact #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Samillion merged 2 commits into from
Dec 28, 2024
Merged

feat: reduce image mode footprint by making the osc compact #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b0ec2
docs: update auto profiles and preview
Samillion Dec 28, 2024
592695c
feat: reduce image mode footprint by making the osc compact
Samillion Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docs/IMAGE_VIEWER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A minimal layout is automatically applied when viewing images while using ModernZ osc, which also features zoom controls.

![image-viewer](https://github.com/user-attachments/assets/d95942c8-0b62-47f9-bca6-8adfaab63538)
![modernz_image_mode](https://github.com/user-attachments/assets/e2501652-aa84-4725-93cf-5cb86931b45e)

## Zoom Controls

Expand All @@ -23,23 +23,25 @@ reset-on-next-file=video-rotate,video-zoom,panscan,video-unscaled,video-align-x,
```

Auto profiles that apply useful mpv options and ModernZ [user options](/docs/USER_OPTS.md) in `Image Viewer` mode:
```ini
```EditorConfig
[Video]
profile-cond=p["current-tracks/video"] and not p["current-tracks/video"].image
profile-restore=copy-equal
taskbar-progress=yes

[Image]
profile-desc=Settings for Image Viewer mode with ModernZ osc
profile-cond=p["current-tracks/video"] and p["current-tracks/video"].image and not p["current-tracks/video"].albumart
profile-restore=copy-equal
image-display-duration=inf
prefetch-playlist=yes
taskbar-progress=no
stop-screensaver=no
title=${media-title} [${?width:${width}x${height}}]
script-opts-append=modernz-windowcontrols_title=${media-title} [${?width:${width}x${height}}]
script-opts-append=modernz-window_title=yes
script-opts-append=modernz-fade_alpha=100
script-opts-append=modernz-bottomhover_zone=100
script-opts-append=modernz-fade_alpha=50
script-opts-append=modernz-bottomhover_zone=50
```

## Useful Scripts
Expand Down
24 changes: 12 additions & 12 deletions modernz.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ end
layouts["modern-image"] = function ()
local osc_geo = {
w = osc_param.playresx,
h = 110
h = 50
}

-- origin of the controllers, left/bottom corner
Expand Down Expand Up @@ -1951,72 +1951,72 @@ layouts["modern-image"] = function ()
-- Playlist
if playlist_button then
lo = add_layout("tog_playlist")
lo.geometry = {x = 25, y = refY - 40, an = 5, w = 24, h = 24}
lo.geometry = {x = 25, y = refY - 30, an = 5, w = 24, h = 24}
lo.style = osc_styles.control_3
lo.visible = osc_param.playresx >= 250 - outeroffset
end

if track_nextprev_buttons then
lo = add_layout("playlist_prev")
lo.geometry = {x = 55 - (playlist_button and 0 or 25), y = refY - 40 , an = 5, w = 30, h = 24}
lo.geometry = {x = 55 - (playlist_button and 0 or 25), y = refY - 30 , an = 5, w = 30, h = 24}
lo.style = osc_styles.control_2

lo = add_layout("playlist_next")
lo.geometry = {x = 80 - (playlist_button and 0 or 25), y = refY - 40 , an = 5, w = 30, h = 24}
lo.geometry = {x = 80 - (playlist_button and 0 or 25), y = refY - 30 , an = 5, w = 30, h = 24}
lo.style = osc_styles.control_2
end

if zoom_control then
-- zoom control
lo = add_layout("zoom_out_icon")
lo.geometry = {x = 130 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 40 , an = 5, w = 30, h = 24}
lo.geometry = {x = 130 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 30 , an = 5, w = 30, h = 24}
lo.style = osc_styles.control_2

lo = new_element("zoom_control_bg", "box")
lo.visible = osc_param.playresx >= 650 - outeroffset and user_opts.zoom_control
lo = add_layout("zoom_control_bg")
lo.geometry = {x = 145 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 40, an = 4, w = 80, h = 4}
lo.geometry = {x = 145 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 30, an = 4, w = 80, h = 4}
lo.layer = 13
lo.alpha[1] = 128
lo.style = osc_styles.volumebar_bg

lo = add_layout("zoom_control")
lo.geometry = {x = 145 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 40, an = 4, w = 80, h = 10}
lo.geometry = {x = 145 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 30, an = 4, w = 80, h = 10}
lo.style = osc_styles.volumebar_fg
lo.slider.gap = 3
lo.slider.tooltip_style = osc_styles.tooltip
lo.slider.tooltip_an = 2

lo = add_layout("zoom_in_icon")
lo.geometry = {x = 240 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 40 , an = 5, w = 30, h = 24}
lo.geometry = {x = 240 - (playlist_button and 0 or 25) - (track_nextprev_buttons and 0 or 70), y = refY - 30 , an = 5, w = 30, h = 24}
lo.style = osc_styles.control_2
end

-- Fullscreen/Info/Pin
if fullscreen_button then
lo = add_layout("tog_fullscreen")
lo.geometry = {x = osc_geo.w - 37, y = refY - 40, an = 5, w = 24, h = 24}
lo.geometry = {x = osc_geo.w - 37, y = refY - 30, an = 5, w = 24, h = 24}
lo.style = osc_styles.control_3
lo.visible = (osc_param.playresx >= 250 - outeroffset)
end

if info_button then
lo = add_layout("tog_info")
lo.geometry = {x = osc_geo.w - 82 + (fullscreen_button and 0 or 45), y = refY - 40, an = 5, w = 24, h = 24}
lo.geometry = {x = osc_geo.w - 82 + (fullscreen_button and 0 or 45), y = refY - 30, an = 5, w = 24, h = 24}
lo.style = osc_styles.control_3
lo.visible = (osc_param.playresx >= 300 - outeroffset)
end

if ontop_button then
lo = add_layout("tog_ontop")
lo.geometry = {x = osc_geo.w - 127 + (info_button and 0 or 45) + (fullscreen_button and 0 or 45), y = refY - 40, an = 5, w = 24, h = 24}
lo.geometry = {x = osc_geo.w - 127 + (info_button and 0 or 45) + (fullscreen_button and 0 or 45), y = refY - 30, an = 5, w = 24, h = 24}
lo.style = osc_styles.control_3
lo.visible = (osc_param.playresx >= 500 - outeroffset)
end

if user_opts.download_button then
lo = add_layout("download")
lo.geometry = {x = osc_geo.w - 172 + (ontop_button and 0 or 45) + (info_button and 0 or 45) + (fullscreen_button and 0 or 45), y = refY - 40, an = 5, w = 24, h = 24}
lo.geometry = {x = osc_geo.w - 172 + (ontop_button and 0 or 45) + (info_button and 0 or 45) + (fullscreen_button and 0 or 45), y = refY - 30, an = 5, w = 24, h = 24}
lo.style = osc_styles.control_3
lo.visible = (osc_param.playresx >= 400 - outeroffset)
end
Expand Down