github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 07:18:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent cde6b41a05 3ecfadf367
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
Screen::Screen(gfx::Screen* screen) : screen_(screen) {
displays_ = screen_->GetAllDisplays();
screen_->AddObserver(this);
}
@@ -64,11 +65,6 @@ gfx::Display Screen::GetPrimaryDisplay() {
}
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_;
}