mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #1710 from deepak1556/screen_patch

Browse source 
screen: initialise displays_ vector with primary display
This commit is contained in:
Cheng Zhao 2015-05-21 14:58:27 +08:00
commit 32b2ef3539
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_screen.cc
View file

@ -48,6 +48,7 @@ std::vector<std::string> MetricsToArray(uint32_t metrics) {
} // namespace } // namespace
Screen::Screen(gfx::Screen* screen) : screen_(screen) { Screen::Screen(gfx::Screen* screen) : screen_(screen) {
displays_ = screen_->GetAllDisplays();
screen_->AddObserver(this); screen_->AddObserver(this);
} }
@ -64,11 +65,6 @@ gfx::Display Screen::GetPrimaryDisplay() {
} }
std::vector<gfx::Display> Screen::GetAllDisplays() { std::vector<gfx::Display> Screen::GetAllDisplays() {
// The Screen::GetAllDisplays doesn't update when there is display added or
// removed, so we have to manually maintain the displays_ to make it up to
// date.
if (displays_.size() == 0)
displays_ = screen_->GetAllDisplays();
return displays_; return displays_;
} }