f5ab042939
## Summary of the Pull Request Introduces convenience type `til::rectangle` which automatically implements our best practices for rectangle-related types and provides automatic conversions in/out of the relevant types. ## PR Checklist * [x] In support of Differential Rendering #778 * [X] I work here. * [x] Tests added/passed * [x] I'm a core contributor. ## Detailed Description of the Pull Request / Additional comments - Automatically converts in from anything with a Left/Top/Right/Bottom or left/top/right/bottom (Win32 `RECT`) - Automatically converts Console type `SMALL_RECT` and shifts it from **inclusive** to **exclusive** on instantiation - Automatically converts out to `SMALL_RECT` (converting back to **inclusive**), `RECT`, or `D2D1_RECT_F`. - Constructs from bare integers written into source file - Constructs from a single `til::point` as a 1x1 size rectangle with top-left corner (origin) at that point - Constructs from a single `til::size` as a WxH size rectangle with top-left corner (origin) at 0,0 - Constructs from a `til::point` and a `til::size` representing the top-left corner and the width by height. - Constructs from a `til::point` and another `til::point` representing the top-left corner and the **exclusive** bottom-right corner. - Default constructs to empty - Uses Chromium numerics for all basic math operations (+, -, *, /) - Provides equality tests - Provides `operator bool` to know when it's valid (has an area > 0) and `empty()` to know the contrary - Accessors for left/top/right/bottom - Type converting accessors (that use safe conversions and throw) for left/top/right/bottom - Convenience methods for finding width/height (with Chromium numerics operations) and type-converting templates (with Chromium numerics conversions). - Accessors for origin (top-left point) and the size/dimensions (as a `til::size`). - Intersect operation on `operator &` to find where two `til::rectangle`s overlap, returned as a `til::rectangle`. - Union operation on `operator |` to find the total area covered by two `til::rectangles`, returned as a `til::rectangle`. - Subtract operation on `operator -` to find the area remaining after one `til::rectangle` is removed from another, returned as a `til::some<til::rectangle, 4>`. - TAEF/WEX Output and Comparators so they will print very nicely with `VERIFY` and `Log` macros in our testing suite. - Additional comparators, TAEF/WEX output, and tests written on `til::some` to support the Subtract operation. - A natvis ## Validation Steps Performed - See automated tests of functionality.
100 lines
4.3 KiB
XML
100 lines
4.3 KiB
XML
|
||
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
|
||
<!-- See https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2017#BKMK_Syntax_reference for documentation -->
|
||
<Type Name="TextColor">
|
||
<DisplayString Condition="_meta==ColorType::IsIndex">{{Index:{_index}}}</DisplayString>
|
||
<DisplayString Condition="_meta==ColorType::IsDefault">{{Default}}</DisplayString>
|
||
<DisplayString Condition="_meta==ColorType::IsRgb">{{RGB:{_red},{_green},{_blue}}}</DisplayString>
|
||
<Expand></Expand>
|
||
</Type>
|
||
|
||
<Type Name="TextAttribute">
|
||
<!-- You can't do too much trickiness inside the DisplayString format
|
||
string, so we'd have to add entries for each flag if we really
|
||
wanted them to show up like that. -->
|
||
<DisplayString>{{FG: {_foreground}, BG: {_background}, Legacy: {_wAttrLegacy}, {_extendedAttrs}}</DisplayString>
|
||
<Expand>
|
||
<Item Name="Legacy">_wAttrLegacy</Item>
|
||
<Item Name="FG">_foreground</Item>
|
||
<Item Name="BG">_background</Item>
|
||
<Item Name="Extended">_extendedAttrs</Item>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="TextAttributeRun">
|
||
<DisplayString>Length={_cchLength} Attr={_attributes}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="Microsoft::Console::Types::Viewport">
|
||
<!-- Can't call functions in here -->
|
||
<DisplayString>{{LT({_sr.Left}, {_sr.Top}) RB({_sr.Right}, {_sr.Bottom}) [{_sr.Right-_sr.Left+1} x { _sr.Bottom-_sr.Top+1}]}}</DisplayString>
|
||
<Expand>
|
||
<ExpandedItem>_sr</ExpandedItem>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="_COORD">
|
||
<DisplayString>{{{X},{Y}}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="_SMALL_RECT">
|
||
<DisplayString>{{LT({Left}, {Top}) RB({Right}, {Bottom}) In:[{Right-Left+1} x {Bottom-Top+1}] Ex:[{Right-Left} x {Bottom-Top}]}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="CharRowCell">
|
||
<DisplayString Condition="_attr._glyphStored">Stored Glyph, go to UnicodeStorage.</DisplayString>
|
||
<DisplayString Condition="_attr._attribute == 0">{_wch,X} Single</DisplayString>
|
||
<DisplayString Condition="_attr._attribute == 1">{_wch,X} Lead</DisplayString>
|
||
<DisplayString Condition="_attr._attribute == 2">{_wch,X} Trail</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="ATTR_ROW">
|
||
<DisplayString>{{ size={_cchRowWidth} }}</DisplayString>
|
||
<Expand>
|
||
<ExpandedItem>_list</ExpandedItem>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="CharRow">
|
||
<DisplayString>{{ wrap={_wrapForced} padded={_doubleBytePadded} }}</DisplayString>
|
||
<Expand>
|
||
<ExpandedItem>_data</ExpandedItem>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="ROW">
|
||
<DisplayString>{{ id={_id} width={_rowWidth} }}</DisplayString>
|
||
<Expand>
|
||
<Item Name="_charRow">_charRow</Item>
|
||
<Item Name="_attrRow">_attrRow</Item>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="std::unique_ptr<TextBuffer,std::default_delete<TextBuffer>>">
|
||
<Expand>
|
||
<ExpandedItem>_Mypair._Myval2</ExpandedItem>
|
||
</Expand>
|
||
</Type>
|
||
|
||
<Type Name="KeyEvent">
|
||
<DisplayString Condition="_keyDown">{{↓ wch:{_charData} mod:{_activeModifierKeys} repeat:{_repeatCount} vk:{_virtualKeyCode} vsc:{_virtualScanCode}}</DisplayString>
|
||
<DisplayString Condition="!_keyDown">{{↑ wch:{_charData} mod:{_activeModifierKeys} repeat:{_repeatCount} vk:{_virtualKeyCode} vsc:{_virtualScanCode}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="til::size">
|
||
<DisplayString>{{W: {_width,d} x H: {_height,d} -> A: {_width * _height, d}}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="til::point">
|
||
<DisplayString>{{X: {_x,d}, Y: {_y,d}}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="til::rectangle">
|
||
<DisplayString>{{L: {_topLeft._x}, T: {_topLeft._y}, R: {_bottomRight._x} B: {_bottomRight._y} [W: {_bottomRight._x - _topLeft._x} x H: {_bottomRight._y - _topLeft._y} -> A: {(_bottomRight._x - _topLeft._x) * (_bottomRight._y - _topLeft._y)}]}}</DisplayString>
|
||
</Type>
|
||
|
||
<Type Name="til::color">
|
||
<DisplayString>{{RGB: {(int)r,d}, {(int)g,d}, {(int)b,d}; α: {(int)a,d}}}</DisplayString>
|
||
</Type>
|
||
</AutoVisualizer>
|