Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions metadata/background.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<_short>Randomize</_short>
<default>false</default>
</option>
<option name="blank" type="bool">
<_short>Blank screen on startup</_short>
<default>true</default>
</option>
<option name="fill_mode" type="string">
<_short>Fill mode</_short>
<default>stretch</default>
Expand Down
17 changes: 0 additions & 17 deletions src/background/background.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,9 @@ WayfireBackground::WayfireBackground(WayfireOutput *output)
{
this->output = output;

if (output->output && inhibit_start)
{
this->inhibited = true;
zwf_output_v2_inhibit_output(output->output);
}

setup_window();
}

void WayfireBackground::uninhibit()
{
if (inhibited && output->output)
{
zwf_output_v2_inhibit_output_done(output->output);
inhibited = false;
}
}

WayfireBackground::~WayfireBackground()
{}

Expand Down Expand Up @@ -212,8 +197,6 @@ void WayfireBackgroundApp::change_background()
for (auto & it : backgrounds)
{
it.second->gl_area->show_image(list[idx]);

it.second->uninhibit();
}

write_cache(list[idx]);
Expand Down
3 changes: 0 additions & 3 deletions src/background/background.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@ class WayfireBackground : public Gtk::Window
private:
void setup_window();
WayfireOutput *output;
WfOption<bool> inhibit_start{"background/blank"};
bool inhibited = false;

public:
WayfireBackground(WayfireOutput *output);

~WayfireBackground();
Glib::RefPtr<BackgroundGLArea> gl_area;
void uninhibit();
};

class WayfireBackgroundApp : public WayfireShellApp
Expand Down