caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK: make some dubious implicit type conversions explicit.

Browse Source
This commit is contained in:
Twisted Pair in my Hair 2016-05-31 18:40:10 +03:00 committed by whitequark
parent 682bfa2732
commit 66746d151f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/gtkmain.cpp
View File

@ -384,7 +384,7 @@ public:
in absolute sizes; modify_font does on GTK2. */ in absolute sizes; modify_font does on GTK2. */
Pango::FontDescription override_font_desc(font_desc); Pango::FontDescription override_font_desc(font_desc);
double dpi = get_screen()->get_resolution(); double dpi = get_screen()->get_resolution();
override_font_desc.set_size(font_height * 72.0 / dpi * Pango::SCALE); override_font_desc.set_size(font_height * (int)(72.0 / dpi) * Pango::SCALE);
_entry.override_font(override_font_desc); _entry.override_font(override_font_desc);
#else #else
_entry.modify_font(font_desc); _entry.modify_font(font_desc);
@ -472,11 +472,11 @@ private:
/* Graphics window */ /* Graphics window */
int DeltaYOfScrollEvent(GdkEventScroll *event) { double DeltaYOfScrollEvent(GdkEventScroll *event) {
#ifdef HAVE_GTK3 #ifdef HAVE_GTK3
int delta_y = event->delta_y; double delta_y = event->delta_y;
#else #else
int delta_y = 0; double delta_y = 0;
#endif #endif
if(delta_y == 0) { if(delta_y == 0) {
switch(event->direction) { switch(event->direction) {
@ -575,7 +575,7 @@ protected:
int x, y; int x, y;
ij_to_xy(event->x, event->y, x, y); ij_to_xy(event->x, event->y, x, y);
SS.GW.MouseScroll(x, y, -DeltaYOfScrollEvent(event)); SS.GW.MouseScroll(x, y, (int)-DeltaYOfScrollEvent(event));
return true; return true;
} }
@ -1047,7 +1047,7 @@ static void RefreshRecentMenu(Command cmd, Command base) {
placeholder->set_sensitive(false); placeholder->set_sensitive(false);
menu->append(*placeholder); menu->append(*placeholder);
} else { } else {
for(int i = 0; i < MAX_RECENT; i++) { for(size_t i = 0; i < MAX_RECENT; i++) {
if(std::string(RecentFile[i]).empty()) if(std::string(RecentFile[i]).empty())
break; break;