Compare commits

...

1 Commits

Author SHA1 Message Date
Dustin Howett
28571c5671 HAX: What if the WPF control used Atlas? 2023-06-28 15:59:19 -05:00
4 changed files with 6 additions and 6 deletions

View File

@@ -204,7 +204,7 @@ HRESULT HwndTerminal::Initialize()
RETURN_HR_IF_NULL(E_POINTER, localPointerToThread);
RETURN_IF_FAILED(localPointerToThread->Initialize(_renderer.get()));
auto dxEngine = std::make_unique<::Microsoft::Console::Render::DxEngine>();
auto dxEngine = std::make_unique<::Microsoft::Console::Render::AtlasEngine>();
RETURN_IF_FAILED(dxEngine->SetHwnd(_hwnd.get()));
RETURN_IF_FAILED(dxEngine->Enable());
_renderer->AddRenderEngine(dxEngine.get());

View File

@@ -4,7 +4,7 @@
#pragma once
#include "../../renderer/base/Renderer.hpp"
#include "../../renderer/dx/DxRenderer.hpp"
#include "../../renderer/atlas/AtlasEngine.h"
#include "../../renderer/uia/UiaRenderer.hpp"
#include "../../cascadia/TerminalCore/Terminal.hpp"
#include "../../types/IControlAccessibilityInfo.h"
@@ -79,7 +79,7 @@ private:
std::unique_ptr<::Microsoft::Terminal::Core::Terminal> _terminal;
std::unique_ptr<::Microsoft::Console::Render::Renderer> _renderer;
std::unique_ptr<::Microsoft::Console::Render::DxEngine> _renderEngine;
std::unique_ptr<::Microsoft::Console::Render::AtlasEngine> _renderEngine;
std::unique_ptr<::Microsoft::Console::Render::UiaEngine> _uiaEngine;
bool _focused{ false };

View File

@@ -15,12 +15,12 @@ namespace Microsoft.Terminal.Wpf
/// <summary>
/// Cursor will be rendered as a blinking block.
/// </summary>
BlinkingBlock = 0,
BlinkingBlock = 1,
/// <summary>
/// Currently identical to <see cref="CursorStyle.BlinkingBlock"/>
/// </summary>
BlinkingBlockDefault = 1,
BlinkingBlockDefault = 0,
/// <summary>
/// Cursor will be rendered as a block that does not blink.

View File

@@ -98,7 +98,7 @@ namespace WpfTerminalTestNetCore
DefaultForeground = 0xcccccc,
DefaultSelectionBackground = 0xcccccc,
SelectionBackgroundAlpha = 0.5f,
CursorStyle = CursorStyle.BlinkingBar,
CursorStyle = CursorStyle.BlinkingBlock,
// This is Campbell.
ColorTable = new uint[] { 0x0C0C0C, 0x1F0FC5, 0x0EA113, 0x009CC1, 0xDA3700, 0x981788, 0xDD963A, 0xCCCCCC, 0x767676, 0x5648E7, 0x0CC616, 0xA5F1F9, 0xFF783B, 0x9E00B4, 0xD6D661, 0xF2F2F2 },
};