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.

Sign up for GitHub

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

Jump to bottom

Add support for setting a tab's color at runtime w/ context menu #3789

Merged
32 commits merged into from
May 4, 2020
Merged

Add support for setting a tab's color at runtime w/ context menu #3789

32 commits merged into from
May 4, 2020

Commits on Oct 26, 2019

  1. Add tab colors microsoft#2994

    @gbaychev
    gbaychev committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    eeeed7f View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Merge from upstream/master

    @gbaychev
    gbaychev committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    a223c8d View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2019

  1. Use events when picked color changes, adjust the preset colors (micro… 

    …soft#2994)
    @gbaychev
    gbaychev committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    524ce1c View commit details
    Browse the repository at this point in the history

  2. Merge from master (microsoft#2994)

    @gbaychev
    gbaychev committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    2109095 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Do code formatting (microsoft#2994)

    @gbaychev
    gbaychev committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    894d8f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev/tabs-color

    @gbaychev
    gbaychev committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    a4b01b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. Remove unwanted merge artifact (microsoft#2994)

    @gbaychev
    gbaychev committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    306a8da View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. Merge from master

    @gbaychev
    gbaychev committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    3fcfe7f View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Merge branch 'master' into dev/tabs-color

    @gbaychev
    gbaychev committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a92a0e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Merge branch 'master' into dev/tabs-color

    @gbaychev
    gbaychev committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    a5aa717 View commit details
    Browse the repository at this point in the history

  2. Incorporate PR feedback microsoft#2994 

    - remove redundant files
- disable the alpha settings in the color picker
- move the winrt/Windows.UI.Popups.h to pch.h
- move the VisualState switching code to a helper method
- use weak ptr in the color pickup flyout
- use weak_ptr in lambdas instead of [this]
    @gbaychev
    gbaychev committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    1cf9407 View commit details
    Browse the repository at this point in the history

  3. Fix code formatting errors microsoft#2994

    @gbaychev
    gbaychev committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    1487ffe View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2020

  1. Merge from master microsoft#2994

    @gbaychev
    gbaychev committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    851b4d4 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Improve the ColorPickupFlyout UI microsoft#2994

    @gbaychev
    gbaychev committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    701b7b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Merge branch 'master' into gbaychev/dev/tabs-color

    @miniksa
    miniksa committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    8a21d91 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2020

  1. Incorporate PR feedback and paint the non-client area microsoft#2994 

    - add color helper class for converting colors, calculating luminance,
etc.
- paint the tab row when a tab's color changes
- paint the title bar when a tab's color changes
- remove spurious orig files
    @gbaychev
    gbaychev committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    63981ef View commit details
    Browse the repository at this point in the history

  2. Remove the non-client area painting code microsoft#2994

    @gbaychev
    gbaychev committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    4e20147 View commit details
    Browse the repository at this point in the history

  3. Use the brush instead of the color when adjusting the tab color micro… 

    …soft#2994
    @gbaychev
    gbaychev committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    e8edec9 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge branch 'master' into dev/tabs-color

    @gbaychev
    gbaychev committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    7cf6b46 View commit details
    Browse the repository at this point in the history

  2. Tweak the color helper a bit for better contrast, now that not the wh… 

    …ole NC area is painted
    @gbaychev
    gbaychev committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    5e735f8 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2020

  1. Merge branch 'master' into dev/tabs-color

    @gbaychev
    gbaychev committed Feb 15, 2020
    Configuration menu
    Copy the full SHA
    cfeda22 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Remove merge artefact from a code comment in TerminalPage.cpp microso… 

    …ft#2994

Co-Authored-By: Mike Griese <migrie@microsoft.com>
    @gbaychev @zadjii-msft
    gbaychev and zadjii-msft authored Feb 20, 2020
    Configuration menu
    Copy the full SHA
    5e2490c View commit details
    Browse the repository at this point in the history

  2. Fix the code formatting and change the quotes in TerminalApp.UnitTest… 

    …s.vcxproj microsoft#2944
    @gbaychev
    gbaychev committed Feb 20, 2020
    Configuration menu
    Copy the full SHA
    d45b70a View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Merge remote-tracking branch 'origin/master' into HEAD

    @DHowett
    DHowett committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    226bcd6 View commit details
    Browse the repository at this point in the history

  2. Tidy up the resources and Xaml code a bit; change to Color...

    @DHowett
    DHowett committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    6686fc2 View commit details
    Browse the repository at this point in the history

  3. Fix WUI; temp. disable new tab btn color; clean xaml

    @DHowett
    DHowett committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    81e32ee View commit details
    Browse the repository at this point in the history

  4. reduce diffs for TA UT vcxproj

    @DHowett
    DHowett committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    1900cfd View commit details
    Browse the repository at this point in the history

  5. Code format

    @DHowett
    DHowett committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    44df3bf View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge remote-tracking branch 'origin/master' into HEAD 

    # Conflicts:
#	src/cascadia/LocalTests_TerminalApp/TabTests.cpp
#	src/cascadia/TerminalApp/Resources/en-US/Resources.resw
#	src/cascadia/TerminalApp/Tab.cpp
#	src/cascadia/TerminalApp/TerminalPage.cpp
#	src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
    @zadjii-msft
    zadjii-msft committed May 1, 2020
    Configuration menu
    Copy the full SHA
    63bc8a5 View commit details
    Browse the repository at this point in the history

  2. Apply spellcheck suggestions from code review 

    Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
    @zadjii-msft @jsoref
    zadjii-msft and jsoref authored May 1, 2020
    Configuration menu
    Copy the full SHA
    a430e60 View commit details
    Browse the repository at this point in the history

  3. Fix typos (hopefully)

    @zadjii-msft
    zadjii-msft committed May 1, 2020
    Configuration menu
    Copy the full SHA
    611bbf6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev/tabs-color' of https://github.com/gbaychev/terminal … 

    …into HEAD

# Conflicts:
#	src/cascadia/TerminalApp/ColorHelper.cpp
    @zadjii-msft
    zadjii-msft committed May 1, 2020
    Configuration menu
    Copy the full SHA
    ec5be66 View commit details
    Browse the repository at this point in the history