Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6bb1d41

Browse filesBrowse files
tordextordex
committed
Merge branch 'master' into common_cairo_container
2 parents 6a0cb81 + 5b01238 commit 6bb1d41
Copy full SHA for 6bb1d41

File tree

Expand file treeCollapse file tree

8 files changed

+18
-16
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+18
-16
lines changed

‎containers/test/Bitmap.cpp

Copy file name to clipboardExpand all lines: containers/test/Bitmap.cpp
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ void Bitmap::draw_line(int x0, int y0, int x1, int y1, web_color color)
3636
}
3737
}
3838

39-
void Bitmap::draw_rect(int x, int y, int width, int height, web_color color)
39+
void Bitmap::draw_rect(int x, int y, int Width, int Height, web_color color)
4040
{
41-
draw_line(x, y, x + width, y, color); // top
42-
draw_line(x, y + height - 1, x + width, y + height - 1, color); // bottom
43-
draw_line(x, y, x, y + height, color); // left
44-
draw_line(x + width - 1, y, x + width - 1, y + height, color); // right
41+
draw_line(x, y, x + Width, y, color); // top
42+
draw_line(x, y + Height - 1, x + Width, y + Height - 1, color); // bottom
43+
draw_line(x, y, x, y + Height, color); // left
44+
draw_line(x + Width - 1, y, x + Width - 1, y + Height, color); // right
4545
}
4646

4747
void Bitmap::fill_rect(position rect, web_color color)

‎containers/windows/cairo/cairo_font.h

Copy file name to clipboardExpand all lines: containers/windows/cairo/cairo_font.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#define NOMINMAX
34
#include <windows.h>
45
#include <stdlib.h>
56
#include <malloc.h>

‎containers/windows/gdiplus/gdiplus_container.cpp

Copy file name to clipboardExpand all lines: containers/windows/gdiplus/gdiplus_container.cpp
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define NOMINMAX
12
#include <windows.h>
23
#include <gdiplus.h>
34
#include "gdiplus_container.h"

‎containers/windows/win32/win32_container.h

Copy file name to clipboardExpand all lines: containers/windows/win32/win32_container.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#define NOMINMAX
23
#include <windows.h>
34
#include <set>
45
#include <litehtml.h>

‎include/litehtml/string_id.h

Copy file name to clipboardExpand all lines: include/litehtml/string_id.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ STRING_ID(
293293

294294
_counter_reset_,
295295
_counter_increment_,
296-
);
296+
)
297297
#undef STRING_ID
298298
extern const string_id empty_id; // _id("")
299299
extern const string_id star_id; // _id("*")

‎include/litehtml/types.h

Copy file name to clipboardExpand all lines: include/litehtml/types.h
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ namespace litehtml
108108
height = sz.height;
109109
}
110110

111-
void move_to(int x, int y)
111+
void move_to(int X, int Y)
112112
{
113-
this->x = x;
114-
this->y = y;
113+
this->x = X;
114+
this->y = Y;
115115
}
116116

117117
bool does_intersect(const position* val) const
@@ -139,9 +139,9 @@ namespace litehtml
139139
return false;
140140
}
141141

142-
bool is_point_inside(int x, int y) const
142+
bool is_point_inside(int X, int Y) const
143143
{
144-
if(x >= left() && x <= right() && y >= top() && y <= bottom())
144+
if(X >= left() && X <= right() && Y >= top() && Y <= bottom())
145145
{
146146
return true;
147147
}

‎src/style.cpp

Copy file name to clipboardExpand all lines: src/style.cpp
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void style::add_property(string_id name, const string& val, const string& baseur
227227
split_string(val, tokens, " ", "", "(");
228228
for (const auto& token : tokens)
229229
{
230-
int idx = value_index(token, border_style_strings);
230+
idx = value_index(token, border_style_strings);
231231
if (idx >= 0)
232232
{
233233
property_value style(idx, important);
@@ -267,7 +267,7 @@ void style::add_property(string_id name, const string& val, const string& baseur
267267
split_string(val, tokens, " ", "", "(");
268268
for (const auto& token : tokens)
269269
{
270-
int idx = value_index(token, border_style_strings);
270+
idx = value_index(token, border_style_strings);
271271
if (idx >= 0)
272272
{
273273
add_parsed_property(_id(_s(name) + "-style"), property_value(idx, important));
@@ -436,7 +436,7 @@ void style::add_property(string_id name, const string& val, const string& baseur
436436
split_string(val, tokens, " ", "", "(");
437437
for (const auto& token : tokens)
438438
{
439-
int idx = value_index(token, list_style_type_strings);
439+
idx = value_index(token, list_style_type_strings);
440440
if (idx >= 0)
441441
{
442442
add_parsed_property(_list_style_type_, property_value(idx, important));
@@ -511,7 +511,6 @@ void style::add_property(string_id name, const string& val, const string& baseur
511511
split_string(val, tokens, " ");
512512
for (const auto& tok : tokens)
513513
{
514-
int idx;
515514
if ((idx = value_index(tok, flex_direction_strings)) >= 0)
516515
{
517516
add_parsed_property(_flex_direction_, property_value(idx, important));
@@ -736,7 +735,6 @@ bool style::parse_one_background(const string& val, document_container* containe
736735

737736
if (position != "")
738737
{
739-
string_vector tokens;
740738
split_string(position, tokens, "/");
741739

742740
if (tokens.size() > 2) return false;

‎test/render_test.cpp

Copy file name to clipboardExpand all lines: test/render_test.cpp
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <gtest/gtest.h>
33
#include <fstream>
44
#ifdef _WIN32
5+
#define NOMINMAX
56
#include "dirent.h"
67
#else
78
#include <dirent.h>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.