Skip to content

Commit

Permalink
Horrifyingly try Gdi Plus as a solution, that is _wrong_ though
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Jul 15, 2019
1 parent 69a78d4 commit e038b5d
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 24 deletions.
86 changes: 65 additions & 21 deletions src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@
#include "pch.h"
#include "NonClientIslandWindow.h"

// using namespace std;
// #include <gdiplus.h>

#ifndef max
#define max(a, b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a, b) (((a) < (b)) ? (a) : (b))
#endif
#include <gdiplus.h>
#undef max
#undef min

extern "C" IMAGE_DOS_HEADER __ImageBase;

using namespace winrt::Windows::UI;
Expand All @@ -24,14 +37,20 @@ constexpr int RECT_HEIGHT(const RECT* const pRect)
return pRect->bottom - pRect->top;
}

Gdiplus::GdiplusStartupInput gdiplusStartupInput;
ULONG_PTR gdiplusToken;

NonClientIslandWindow::NonClientIslandWindow() noexcept :
IslandWindow{},
_isMaximized{ false }
{
// Initialize GDI+.
Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
}

NonClientIslandWindow::~NonClientIslandWindow()
{
Gdiplus::GdiplusShutdown(gdiplusToken);
}

// Method Description:
Expand Down Expand Up @@ -536,34 +555,59 @@ RECT NonClientIslandWindow::GetMaxWindowRectInPixels(const RECT* const prcSugges
const auto color = RGB(backgroundColor.R, backgroundColor.G, backgroundColor.B);
_backgroundBrush = wil::unique_hbrush(CreateSolidBrush(color));

const auto debugColor0 = RGB(255, 0, 255);
const auto debugBrush0 = wil::unique_hbrush(CreateSolidBrush(debugColor0));
const auto debugColor1 = RGB(0, 255, 255);
const auto debugBrush1 = wil::unique_hbrush(CreateSolidBrush(debugColor1));
const auto debugColor2 = RGB(255, 255, 0);
const auto debugBrush2 = wil::unique_hbrush(CreateSolidBrush(debugColor2));
const auto debugColor3 = RGB(1, 1, 1);
const auto debugBrush3 = wil::unique_hbrush(CreateSolidBrush(debugColor3));
const auto debugColor4 = RGB(255, 0, 0);
const auto debugBrush4 = wil::unique_hbrush(CreateSolidBrush(debugColor4));

RECT windowRect = {};
::GetWindowRect(_window.get(), &windowRect);
const auto cx = windowRect.right - windowRect.left;
const auto cy = windowRect.bottom - windowRect.top;

// Fill in the _entire_ titlebar area.
RECT dragBarRect = {};
dragBarRect.left = xPos;
dragBarRect.right = xPos + cx;
dragBarRect.top = yPos;
dragBarRect.bottom = yPos + cy;
::FillRect(hdc.get(), &dragBarRect, _backgroundBrush.get());

// Draw the top window border
RECT clientRect = { 0, 0, cx, yPos };
::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());

// Draw the left window border
clientRect = { 0, 0, xPos, cy };
::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());
Gdiplus::Graphics graphics(hdc.get());
Gdiplus::Color bgColor{ 255, 255, 0, 0 };
Gdiplus::SolidBrush solidBrush(bgColor);

// const RECT wholeWindowRelativeToWindow = { 0, 0, cx, cy };
// ::FillRect(hdc.get(), &wholeWindowRelativeToWindow, debugBrush3.get());
auto result = graphics.FillRectangle(&solidBrush, 0, 0, cx, cy);
// auto result = graphics.FillRectangle(&solidBrush, 200, 200, 200, 200);
result;

// // Fill in the _entire_ titlebar area.
RECT dragBarRect = GetDragAreaRect();
// dragBarRect.left = xPos;
// dragBarRect.right = xPos + cx;
// dragBarRect.top = yPos;
// dragBarRect.bottom = yPos + cy;
// ::FillRect(hdc.get(), &dragBarRect, _backgroundBrush.get());
::FillRect(hdc.get(), &dragBarRect, debugBrush1.get());

// // Draw the top window border
// RECT clientRect = { 0, 0, cx, yPos };
// ::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());

// // Draw the left window border
// clientRect = { 0, 0, xPos, cy };
// ::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());

// Draw the bottom window border
clientRect = { 0, cy - yPos, cx, cy };
::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());

// Draw the right window border
clientRect = { cx - xPos, 0, cx, cy };
::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());
// clientRect = { 0, cy - yPos, cx, cy };
// ::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());
// ::FillRect(hdc.get(), &clientRect, debugBrush2.get());
// ::FillRect(hdc.get(), &clientRect, debugBrush3.get());
// ::FillRect(hdc.get(), &clientRect, debugBrush4.get());

// // Draw the right window border
// clientRect = { cx - xPos, 0, cx, cy };
// ::FillRect(hdc.get(), &clientRect, _backgroundBrush.get());
}

return 0;
Expand Down
6 changes: 3 additions & 3 deletions src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<AdditionalIncludeDirectories>"$(OpenConsoleDir)src\cascadia\TerminalCore\lib\Generated Files";%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>gdi32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>gdi32.lib;gdiplus.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<PropertyGroup>
Expand Down Expand Up @@ -126,12 +126,12 @@
<!-- DON'T REDIRECT OUR OUTPUT -->
<NoOutputRedirection>true</NoOutputRedirection>
</PropertyGroup>
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.2.190611001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.190521.3\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.190521.3\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.1\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.1\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.1\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0-preview6.1\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
Expand Down

0 comments on commit e038b5d

Please sign in to comment.