Skip to content

Commit

Permalink
change color based on if the window is activated or now
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Apr 26, 2022
1 parent cd0012a commit ac49459
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 8 deletions.
4 changes: 4 additions & 0 deletions src/cascadia/TerminalApp/AppLogic.cpp
View file
Expand Up @@ -1211,6 +1211,10 @@ namespace winrt::TerminalApp::implementation
}
return { nullptr };
}
void AppLogic::WindowActivated(const bool activated)
{
_root->WindowActivated(activated);
}

bool AppLogic::HasCommandlineArguments() const noexcept
{
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/AppLogic.h
View file
Expand Up @@ -117,6 +117,7 @@ namespace winrt::TerminalApp::implementation

winrt::TerminalApp::TaskbarState TaskbarState();
winrt::Windows::UI::Xaml::Media::Brush TitlebarBrush();
void WindowActivated(const bool activated);

bool GetMinimizeToNotificationArea();
bool GetAlwaysShowNotificationIcon();
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/AppLogic.idl
View file
Expand Up @@ -94,6 +94,7 @@ namespace TerminalApp

TaskbarState TaskbarState{ get; };
Windows.UI.Xaml.Media.Brush TitlebarBrush { get; };
void WindowActivated(Boolean activated);

Boolean ShouldUsePersistedLayout();
Boolean ShouldImmediatelyHandoffToElevated();
Expand Down
26 changes: 25 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.cpp
View file
Expand Up @@ -214,7 +214,7 @@ namespace winrt::TerminalApp::implementation
else
{
// const auto accentColor = res.Lookup(winrt::box_value(L"SystemAccentColor")).as<Media::SolidColorBrush>();
auto accentColor = winrt::unbox_value_or<winrt::Windows::UI::Color>(res.Lookup(winrt::box_value(L"SystemAccentColor")), backgroundSolidBrush.Color());
auto accentColor = winrt::unbox_value_or<winrt::Windows::UI::Color>(res.Lookup(winrt::box_value(L"SystemAccentColorDark3")), backgroundSolidBrush.Color());
const auto accentBrush = Media::SolidColorBrush();
accentBrush.Color(accentColor);

Expand Down Expand Up @@ -3933,4 +3933,28 @@ namespace winrt::TerminalApp::implementation

applicationState.DismissedMessages(std::move(messages));
}

void TerminalPage::WindowActivated(const bool activated)
{
if (_settings == nullptr)
{
return;
}

if (_settings.GlobalSettings().UseAcrylicInTabRow())
{
// do nothing
}
else
{
const auto res = Application::Current().Resources();
// const auto accentColor = res.Lookup(winrt::box_value(L"SystemAccentColor")).as<Media::SolidColorBrush>();
auto accentColor = winrt::unbox_value<winrt::Windows::UI::Color>(res.Lookup(winrt::box_value(activated ? L"SystemAccentColorDark3" : L"SystemAccentColorDark2")));
const auto accentBrush = Media::SolidColorBrush();
accentBrush.Color(accentColor);

TitlebarBrush(accentBrush);
_tabRow.Background(TitlebarBrush());
}
}
}
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/TerminalPage.h
View file
Expand Up @@ -133,6 +133,7 @@ namespace winrt::TerminalApp::implementation
bool IsElevated() const noexcept;

void OpenSettingsUI();
void WindowActivated(const bool activated);

WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);

Expand Down
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/TerminalPage.idl
View file
Expand Up @@ -46,6 +46,7 @@ namespace TerminalApp
TaskbarState TaskbarState{ get; };

Windows.UI.Xaml.Media.Brush TitlebarBrush { get; };
void WindowActivated(Boolean activated);

event Windows.Foundation.TypedEventHandler<Object, String> TitleChanged;
event Windows.Foundation.TypedEventHandler<Object, LastTabClosedEventArgs> LastTabClosed;
Expand Down
9 changes: 8 additions & 1 deletion src/cascadia/WindowsTerminal/AppHost.cpp
View file
Expand Up @@ -888,8 +888,15 @@ void AppHost::_FindTargetWindow(const winrt::Windows::Foundation::IInspectable&
args.ResultTargetWindowName(targetWindow.WindowName());
}

winrt::fire_and_forget AppHost::_WindowActivated()
winrt::fire_and_forget AppHost::_WindowActivated(bool activated)
{
_logic.WindowActivated(activated);

if (!activated)
{
co_return;
}

co_await winrt::resume_background();

if (auto peasant{ _windowManager.CurrentWindow() })
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/WindowsTerminal/AppHost.h
View file
Expand Up @@ -55,7 +55,7 @@ class AppHost
void _RaiseVisualBell(const winrt::Windows::Foundation::IInspectable& sender,
const winrt::Windows::Foundation::IInspectable& arg);
void _WindowMouseWheeled(const til::point coord, const int32_t delta);
winrt::fire_and_forget _WindowActivated();
winrt::fire_and_forget _WindowActivated(bool activated);
void _WindowMoved();

void _DispatchCommandline(winrt::Windows::Foundation::IInspectable sender,
Expand Down
6 changes: 2 additions & 4 deletions src/cascadia/WindowsTerminal/IslandWindow.cpp
View file
Expand Up @@ -439,10 +439,8 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
case WM_ACTIVATE:
{
// wparam = 0 indicates the window was deactivated
if (LOWORD(wparam) != 0)
{
_WindowActivatedHandlers();
}
const bool activated = LOWORD(wparam) != 0;
_WindowActivatedHandlers(activated);

break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/WindowsTerminal/IslandWindow.h
View file
Expand Up @@ -66,7 +66,7 @@ class IslandWindow :
WINRT_CALLBACK(DragRegionClicked, winrt::delegate<>);
WINRT_CALLBACK(WindowCloseButtonClicked, winrt::delegate<>);
WINRT_CALLBACK(MouseScrolled, winrt::delegate<void(til::point, int32_t)>);
WINRT_CALLBACK(WindowActivated, winrt::delegate<void()>);
WINRT_CALLBACK(WindowActivated, winrt::delegate<void(bool)>);
WINRT_CALLBACK(HotkeyPressed, winrt::delegate<void(long)>);
WINRT_CALLBACK(NotifyNotificationIconPressed, winrt::delegate<void()>);
WINRT_CALLBACK(NotifyWindowHidden, winrt::delegate<void()>);
Expand Down

1 comment on commit ac49459

@github-actions
Copy link

@github-actions github-actions bot commented on ac49459 Apr 26, 2022 •
edited

Choose a reason for hiding this comment

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

@check-spelling-bot Report

Unrecognized words, please review:

  • nciw
Previously acknowledged words that are now absent azurewebsites Consolescreen css cxcy DCompile debolden deconstructed devicefamily GETKEYSTATE guardxfg LLVM LPCHARSETINFO MAPVIRTUALKEY MSDL ned newcursor NOWAIT pgorepro pgort PGU redistributable Timeline timelines unintense UWA UWAs VKKEYSCAN WResult xfg
To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/migrie/titebar-colors branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/expect/alphabet.txt
.github/actions/spelling/expect/expect.txt
.github/actions/spelling/expect/web.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spelling/expect/ac49459dde07e410594a35c6ec7aed81cad90515.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/microsoft/terminal/comments/72204277" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")
  

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u
✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. You can copy the contents of each perl command excluding the outer ' marks and dropping any '"/"' quotation mark pairs into a file and then run perl file.pl from the root of the repository to run the code. Alternatively, you can manually insert the items...

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

🗜️ If you see a bunch of garbage

If it relates to a ...

well-formed pattern

See if there's a pattern that would match it.

If not, try writing one and adding it to a patterns/{file}.txt.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.

binary-ish string

Please add a file path to the excludes.txt file instead of just accepting the garbage.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

Please sign in to comment.