Skip to content

Allow moving the SelectedItemsAdder popup by a given offset #460

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

Open
JojiiOfficial wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow moving the SelectedItemsAdder popup by a given offset #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ Wieland Hoffmann <themineo@gmail.com>
Wojciech Siewierski <wojciech.siewierski@onet.pl>
Yannick LM <yannicklm1337@gmail.com>
V <v@anomalous.eu>
Jojii <jojii@gmx.net>
17 changes: 11 additions & 6 deletions src/screens/sel_items_adder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ SelectedItemsAdder::SelectedItemsAdder()
using Global::MainHeight;
using Global::MainStartY;
setDimensions();


size_t x_col_offset = std::floor((Config.selected_item_x_offset/100.0f)*(COLS-m_playlist_selector_width));

m_playlist_selector = Component(
(COLS-m_playlist_selector_width)/2,
((COLS-m_playlist_selector_width)+x_col_offset)/2,
MainStartY+(MainHeight-m_playlist_selector_height)/2,
m_playlist_selector_width,
m_playlist_selector_height,
Expand All @@ -73,7 +75,7 @@ SelectedItemsAdder::SelectedItemsAdder()
m_playlist_selector.setItemDisplayer(DisplayComponent);

m_position_selector = Component(
(COLS-m_position_selector_width)/2,
((COLS-m_playlist_selector_width)+x_col_offset)/2,
MainStartY+(MainHeight-m_position_selector_height)/2,
m_position_selector_width,
m_position_selector_height,
Expand Down Expand Up @@ -135,14 +137,17 @@ void SelectedItemsAdder::resize()
using Global::MainHeight;
using Global::MainStartY;
setDimensions();

size_t x_col_offset = std::floor((Config.selected_item_x_offset/100.0f)*(COLS-m_playlist_selector_width));

m_playlist_selector.resize(m_playlist_selector_width, m_playlist_selector_height);
m_playlist_selector.moveTo(
(COLS-m_playlist_selector_width)/2,
((COLS-m_playlist_selector_width)+x_col_offset)/2,
MainStartY+(MainHeight-m_playlist_selector_height)/2
);
m_position_selector.resize(m_position_selector_width, m_position_selector_height);
m_position_selector.moveTo(
(COLS-m_position_selector_width)/2,
((COLS-m_playlist_selector_width)+x_col_offset)/2,
MainStartY+(MainHeight-m_position_selector_height)/2
);
if (previousScreen() && previousScreen()->hasToBeResized) // resize background window
Expand Down Expand Up @@ -353,7 +358,7 @@ void SelectedItemsAdder::setDimensions()

m_playlist_selector_width = COLS*0.6;
m_playlist_selector_height = std::min(MainHeight, size_t(LINES*0.66));

m_position_selector_width = std::min(size_t(35), size_t(COLS));
m_position_selector_height = std::min(size_t(11), MainHeight);
}
1 change: 1 addition & 0 deletions src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
nullptr,
std::ref(selected_item_suffix_length),
ph::_1));
p.add("selected_item_x_offset", &selected_item_x_offset, "1");
p.add("modified_item_prefix", &modified_item_prefix, "$3>$9 ", buffer);
p.add("song_window_title_format", &song_window_title_format,
"{%a - }{%t}|{%f}", [](std::string v) {
Expand Down
1 change: 1 addition & 0 deletions src/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ struct Configuration

size_t selected_item_prefix_length;
size_t selected_item_suffix_length;
size_t selected_item_x_offset;
size_t now_playing_prefix_length;
size_t now_playing_suffix_length;
size_t current_item_prefix_length;
Expand Down