Skip to content

background: avoid setting the same image twice in a row #409

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
ammen99 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

background: avoid setting the same image twice in a row #409

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
27 changes: 17 additions & 10 deletions src/background/background.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ void WayfireBackgroundApp::create(int argc, char **argv)
void WayfireBackgroundApp::on_activate()
{
WayfireShellApp::on_activate();

prep_cache();
// Initial setup of timer etc.
change_background();
}

void WayfireBackgroundApp::prep_cache()
Expand All @@ -92,7 +93,10 @@ void WayfireBackgroundApp::handle_new_output(WayfireOutput *output)
{
backgrounds[output] = std::unique_ptr<WayfireBackground>(
new WayfireBackground(output));
change_background();
if (!current_background.empty())
{
backgrounds[output]->gl_area->show_image(current_background);
}
}

void WayfireBackgroundApp::handle_output_removed(WayfireOutput *output)
Expand All @@ -108,7 +112,8 @@ std::string WayfireBackgroundApp::get_application_name()
std::vector<std::string> WayfireBackgroundApp::get_background_list(std::string path)
{
wordexp_t exp;
std::cout << "Looking in " << path << std::endl;
LOGD("Looking for background images in ", path);

/* Expand path */
if (wordexp(path.c_str(), &exp, 0))
{
Expand Down Expand Up @@ -187,18 +192,20 @@ void WayfireBackgroundApp::change_background()
std::string background_path = WfOption<std::string>{"background/image"};
auto list = get_background_list(background_path);
auto idx = find(list.begin(), list.end(), current_background) - list.begin();

std::cout << current_background << " " << idx << std::endl;
idx = (idx + 1) % list.size();
// gl_area->show_image(list[idx]);
for (auto & it : backgrounds)

if (current_background != list[idx])
{
it.second->gl_area->show_image(list[idx]);
for (auto & it : backgrounds)
{
it.second->gl_area->show_image(list[idx]);
}

current_background = list[idx];
write_cache(list[idx]);
}

write_cache(list[idx]);
reset_cycle_timeout();
current_background = list[idx];
}

gboolean WayfireBackgroundApp::sigusr1_handler(void *instance)
Expand Down
Loading