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

Change the ControlCore layer to own a copy of its settings #11619

Merged
62 commits merged into from
Dec 1, 2021

Commits on Sep 23, 2021

  1. Configuration menu
    Copy the full SHA
    43ec102 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dad065e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    981d8cc View commit details
    Browse the repository at this point in the history
  4. this is wild

    zadjii-msft committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    d6989ec View commit details
    Browse the repository at this point in the history
  5. missed one

    zadjii-msft committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    4b18bb4 View commit details
    Browse the repository at this point in the history
  6. move to a common header

    zadjii-msft committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    7fc2f10 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Configuration menu
    Copy the full SHA
    c7536ed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c26dd6b View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. I think I needed this to get it to build. Or I started breaknig somet…

    …hing. Idk, I wrote this a few days ago, I just need this clone for testing so `git commit`
    zadjii-msft committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    4a1baf0 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. Configuration menu
    Copy the full SHA
    fbba74e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1413d01 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. this builds at least

    zadjii-msft committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    31e7998 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f7e883 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. Configuration menu
    Copy the full SHA
    a9de82e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70b9f8c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0371194 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4912b65 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    888e157 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. This is how I wanted to solve the color scheme setting, previewing, b…

    …ut UpdateAppearance ends up getting called immediately after so it blows it away. Dustin had a crazy idea...
    zadjii-msft committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    17829f4 View commit details
    Browse the repository at this point in the history
  2. you've seen WINRT_PROPERTY now get ready for RUNTIME_PROPERTY

        and as soon ad I typed that out I realized that WINRT_PROPERTY already has
        setters and setting an optional override gets me nothing
    
        sure I could stealth the new value in underneath the runtime value, so
        reloading the settings doesn't reset font size, colors, etc
    
        I could
    
        but it sure does feel like overkill for "refactor but don't change anything"
    zadjii-msft committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    1aa2849 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e3a50cf View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. This almost works for previewing, but I fudged something up with the …

    …backgrounds and now they're totally transparent
    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    9160966 View commit details
    Browse the repository at this point in the history
  2. whoop, it works!

    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    282c03c View commit details
    Browse the repository at this point in the history
  3. cleanup

    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    6babb4e View commit details
    Browse the repository at this point in the history
  4. lots of cleanup

    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    94f4ef5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    28cbad1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    634b685 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    48ca704 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    217742c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4a700cd View commit details
    Browse the repository at this point in the history
  10. fix control unit tets

    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    01cef2f View commit details
    Browse the repository at this point in the history
  11. fix the local tests too

    zadjii-msft committed Oct 26, 2021
    1 Configuration menu
    Copy the full SHA
    8c7ce77 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7c28851 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bf9bf0e View commit details
    Browse the repository at this point in the history
  14. 1 Configuration menu
    Copy the full SHA
    f087dd8 View commit details
    Browse the repository at this point in the history
  15. thanks spell bot

    zadjii-msft committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    f111c6d View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. Configuration menu
    Copy the full SHA
    51486a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Configuration menu
    Copy the full SHA
    6da5d79 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. Configuration menu
    Copy the full SHA
    83e7aea View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2021

  1. Configuration menu
    Copy the full SHA
    d51c2cf View commit details
    Browse the repository at this point in the history
  2. The simple PR feedback

    zadjii-msft committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    9eeea4a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5173ea3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    147101f View commit details
    Browse the repository at this point in the history
  5. Revert 5173ea3

    > yes, but also, no. I tried doing that in 5173ea3, but alas, that doesn't work. There's a lot of places that assumes `IControlSettings requires IControlAppearance`. If you make `ControlSettings` only implement `IControlSettings` and `ICoreSettings`, and not the Appearances as well, then there are various places in UpdateSettings that will crash. (Those could likely be re-written as well, with some pain.)
    >
    > In almost all cases where we're using a `IControlSettings` as an Appearance, we're only interested in the `FocusedAppearance`'s value.
    zadjii-msft committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    5cd8096 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    713f72e View commit details
    Browse the repository at this point in the history
  7. okay, so it's just vintage(100)+cleartype that doesn't work. Everythi…

    …ng else gracefully falls back to grayscale
    zadjii-msft committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    59c193c View commit details
    Browse the repository at this point in the history
  8. MIKE YOU HAVE TEST CASES HERE

      This works for opacity for all Terminal cases. Need to still fix conhost.
    
    ```json
        "persistedWindowLayouts" :
        [
            {
                "initialPosition" : "149,43",
                "initialSize" :
                {
                    "height" : 901.0,
                    "width" : 1499.0
                },
                "tabLayout" :
                [
                    {
                        "action" : "newTab",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + cleartype + acrylic",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + cleartype + acrylic"
                    },
                    {
                        "action" : "splitPane",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + cleartype + vintage",
                        "size" : 0.5,
                        "split" : "right",
                        "splitMode" : "manual",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + cleartype + vintage"
                    },
                    {
                        "action" : "moveFocus",
                        "direction" : "previousInOrder"
                    },
                    {
                        "action" : "splitPane",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + grayscale + acrylic",
                        "size" : 0.70000004768371582,
                        "split" : "down",
                        "splitMode" : "manual",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + grayscale + acrylic"
                    },
                    {
                        "action" : "splitPane",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + cleartype + acrylic(100)",
                        "size" : 0.5,
                        "split" : "down",
                        "splitMode" : "manual",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + cleartype + acrylic(100)"
                    },
                    {
                        "action" : "moveFocus",
                        "direction" : "nextInOrder"
                    },
                    {
                        "action" : "splitPane",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + grayscale + vintage",
                        "size" : 0.70000004768371582,
                        "split" : "down",
                        "splitMode" : "manual",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + grayscale + vintage"
                    },
                    {
                        "action" : "splitPane",
                        "commandline" : "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                        "profile" : "One Half Light + cleartype + vintage(100)",
                        "size" : 0.5,
                        "split" : "down",
                        "splitMode" : "manual",
                        "startingDirectory" : null,
                        "suppressApplicationTitle" : false,
                        "tabTitle" : "One Half Light + cleartype + vintage(100)"
                    },
                    {
                        "action" : "focusPane",
                        "id" : 5
                    },
                ]
            }
        ]
    ```
    
        with the following profiles:
    
        ```json
                {
                    "antialiasingMode": "cleartype",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "guid": "{e7f732da-f5c2-5f52-afd2-82518887a012}",
                    "name": "One Half Light + cleartype + acrylic",
                    "opacity": 50,
                    "useAcrylic": true
                },
                {
                    "antialiasingMode": "cleartype",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "guid": "{e52bc30c-4fa8-5650-9c00-b619544efa5e}",
                    "name": "One Half Light + cleartype + vintage",
                    "opacity": 50,
                    "useAcrylic": false
                },
                {
                    "antialiasingMode": "grayscale",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "guid": "{a870263b-0a3f-561f-82d2-bafc1163f1fc}",
                    "name": "One Half Light + grayscale + acrylic",
                    "opacity": 50,
                    "useAcrylic": true
                },
                {
                    "antialiasingMode": "grayscale",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "guid": "{58a6ffb9-ead3-53ae-a696-c3eb27292578}",
                    "name": "One Half Light + grayscale + vintage",
                    "opacity": 50,
                    "useAcrylic": false
                },
                {
                    "antialiasingMode": "cleartype",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "name": "One Half Light + cleartype + acrylic(100)",
                    "opacity": 100,
                    "useAcrylic": true
                },
                {
                    "antialiasingMode": "cleartype",
                    "colorScheme": "One Half Light",
                    "commandline": "c:\\windows\\system32\\cmd.exe /k colortool.exe -c",
                    "font":
                    {
                        "size": 8
                    },
                    "name": "One Half Light + cleartype + vintage(100)",
                    "opacity": 100,
                    "useAcrylic": false
                },
    
        ```
    zadjii-msft committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    6e8a2ad View commit details
    Browse the repository at this point in the history
  9. Transparency is hard

    zadjii-msft committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    88f2e64 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ae833a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. This is a checkpoint

      * Dismissing a preview with an unfocused appearance is what's really broken here. That's never going to be able to go back to the original table, because the original table will be replaced with the unfocused appearance's table on the dismiss.
        - Going to fix that by using the focused appearance's table by default for the scheme when there's an unfocused appearance.
      * This is a little janky still, we flash the old schemes through on dismiss, which is probably wrong.
    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    2a18d7d View commit details
    Browse the repository at this point in the history
  2. fix previewing, again

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    a9e706c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1a7649c View commit details
    Browse the repository at this point in the history
  4. rename this one too

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    5adb327 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a338ca1 View commit details
    Browse the repository at this point in the history
  6. fix conflicts with #11625

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    8532dd6 View commit details
    Browse the repository at this point in the history
  7. more todos

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    7bb8975 View commit details
    Browse the repository at this point in the history
  8. fix the tests

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    efdc090 View commit details
    Browse the repository at this point in the history
  9. tests are hard

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    8313987 View commit details
    Browse the repository at this point in the history
  10. this was a nit

    zadjii-msft committed Nov 11, 2021
    Configuration menu
    Copy the full SHA
    a1bfa33 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. Configuration menu
    Copy the full SHA
    b421ee6 View commit details
    Browse the repository at this point in the history
  2. figure this out

    zadjii-msft committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    d675fd8 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. Configuration menu
    Copy the full SHA
    3acb374 View commit details
    Browse the repository at this point in the history