openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Remove the RECT typedef for my custom rectangle class

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-17 00:30:02 -05:00
parent 23b2414c0d
commit 8bb96396a5
43 changed files with 677 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osx/dialogxml/field.cpp
View File

@@ -109,12 +109,12 @@ cTextField::~cTextField(){}
void cTextField::draw(){
static const sf::Color hiliteClr = {127,127,127}, ipClr = {92, 92, 92};
inWindow->setActive();
RECT outline = frame;
rectangle outline = frame;
outline.inset(-2,-2);
fill_rect(*inWindow, outline, sf::Color::White);
frame_rect(*inWindow, outline, sf::Color::Black);
std::string contents = getText();
RECT rect = frame;
rectangle rect = frame;
rect.inset(2,2);
TextStyle style;
style.font = FONT_PLAIN;
@@ -132,7 +132,7 @@ void cTextField::draw(){
std::string dummy_str = contents + " ";
if(tmp_hilite.first >= tmp_hilite.second)
tmp_hilite.second = tmp_hilite.first + 1;
std::vector<RECT> rects = draw_string_hilite(*inWindow, rect, dummy_str, style, {tmp_hilite}, {0,0,0});
std::vector<rectangle> rects = draw_string_hilite(*inWindow, rect, dummy_str, style, {tmp_hilite}, {0,0,0});
if(!rects.empty()) {
// We only care about the first and last rects. Furthermore, we only really need one point
location ip_pos = rects[0].centre(), sp_pos = rects[rects.size() - 1].centre();
@@ -172,7 +172,7 @@ void cTextField::draw(){
ip_offset = string_length(pre_ip, style);
if(ip_timer.getElapsedTime().asMilliseconds() < 500) {
// printf("Blink on (%d); ", ip_timer.getElapsedTime().asMilliseconds());
RECT ipRect = {0, 0, 15, 1};
rectangle ipRect = {0, 0, 15, 1};
if(iSnippet >= 0)
ipRect.offset(snippets[iSnippet].at.x + ip_offset, snippets[iSnippet].at.y + 1);
else ipRect.offset(frame.topLeft()), ipRect.offset(3,2);