Skip to content
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.

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

Update zoneset data for new virtual desktops #21

Merged

Conversation

SeraphimaZykova
Copy link
Collaborator

Summary of the Pull Request

Update active zone set with actual data, not just zoneset uuid. New virtual desktop will use the same zoneset as the primary desktop if the primary monitor has a zoneset.

@enricogior
Copy link
Collaborator

I tested the changes and it works as expected.

{
if (!uuid.empty() && deviceInfoMap.find(deviceId) != deviceInfoMap.end())
if (deviceInfoMap.find(deviceId) != deviceInfoMap.end())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can re-organize it like:

auto it = deviceInfoMap.find(deviceId);
if (it != deviceInfoMap.end()) {
    it->second.activeZoneSet = data;
}

To avoid searching for deviceId inside map twice.

@SeraphimaZykova SeraphimaZykova merged commit 547a587 into stefansjfw:json-migration Feb 6, 2020
@SeraphimaZykova SeraphimaZykova deleted the new_vd_zoneset_fix branch February 6, 2020 17:46
SeraphimaZykova added a commit that referenced this pull request Feb 10, 2020
* update active zone set with actual data
stefansjfw added a commit that referenced this pull request Feb 23, 2020
…oft#1194)

* Migrate FancyZones data persisting from Registry to JSON file

* Address PR comment: Remove redundant check

* Addres PR comment: Remove unused Dpi and add CmdArgs enum

* Address PR comment: Make methods const and inline

* Address PR comments: Expose GenerateUniqueId function and use const ref instead of passing wstring by value

* Address PR comment: Use lamdba as callback

* Address PR comment: Move GenerateUniqueId to ZoneWindowUtils namespace

* Address PR comment: Use regular comparison instead of std::wstring::compare

* Address PR comment: Use std::wstring_view for tmp file paths

* Address PR comment: Use scoped lock when accessing member data

* Address PR comment: Remove typedefs to increase code readability

* Address PR comment: removed nullptr checks with corresponding tests

* Address PR comment: Move ZoneSet object instead of copying

* Address PR comment: Make FancyZonesData instance const where possible

* Remove unnecessary gutter variable during calculating zone coordinates

* Remove uneeded subclass

* Avoid unnecessary copying and reserve space for vector if possible

* Save FancyZones data after exiting editor

* App zone history (#18)

* added window and zone set ids to app zone history

* Rename JSON file

* Remove AppZoneHistory migration

* Move parsing of ZoneWindow independent temp files outside of it

* Unit tests update (#19)

* check device existence in map
* updated ZoneSet tests
* updated JsonHelpers tests

* Use single zone count information

* Remove uneeded tests

* Remove one more test

* Remove uneeded line

* Address PR comments - Missing whitespace

* Update zoneset data for new virtual desktops (#21)

* update active zone set with actual data

* Introduce Blank zone set (used to indicate that no layout applied yet). Move parsing completely outside of ZoneWindow.

* Fix unit tests to match modifications in implementation

* Fix applying layouts on startup (second monitor)

Co-authored-by: vldmr11080 <[email protected]>
Co-authored-by: Seraphima <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants