luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stable

Browse Source
This commit is contained in:
gambas 2018-05-12 19:45:54 +02:00
commit 790c023ff7
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/gambas3/.src/Editor/Form/FForm.class
View File

@ -4335,7 +4335,7 @@ Public Sub dwgInfo_Draw()
If Not $cInfo Then Return If Not $cInfo Then Return
iCol = Color.SetAlpha(Color.TooltipBackground, 128) iCol = Color.SetAlpha(Color.TextForeground, 128)
H = Paint.Font.Height + DS H = Paint.Font.Height + DS
Paint.FillRect(0, 0, Paint.W, H, iCol) Paint.FillRect(0, 0, Paint.W, H, iCol)

8
app/src/gambas3/.src/Editor/Form/FForm.form
View File

@ -681,15 +681,15 @@
Background = Color.Background Background = Color.Background
} }
} }
{ dwgInfo DrawingArea
MoveScaled(59,14,20,6)
Ignore = True
}
{ dwgBackground DrawingArea { dwgBackground DrawingArea
MoveScaled(76,26,12,9) MoveScaled(76,26,12,9)
Background = Color.LightForeground Background = Color.LightForeground
Ignore = True Ignore = True
} }
{ dwgInfo DrawingArea
MoveScaled(65,45,20,6)
Ignore = True
}
{ timMoveInfo #Timer { timMoveInfo #Timer
#MoveScaled(108,16) #MoveScaled(108,16)
} }

2
app/src/gambas3/.src/Editor/Image/FImageEditor.class
View File

@ -3159,7 +3159,7 @@ Public Sub dwgInfo_Draw()
If Not $cInfo Then Return If Not $cInfo Then Return
iCol = Color.SetAlpha(Color.TooltipBackground, 128) iCol = Color.SetAlpha(Color.TextForeground, 128)
H = Paint.Font.Height + DS H = Paint.Font.Height + DS
Paint.FillRect(0, 0, Paint.W, H, iCol) Paint.FillRect(0, 0, Paint.W, H, iCol)

4
gb.gtk/src/gmainwindow.cpp
View File

@ -1429,7 +1429,11 @@ void gMainWindow::setUtility(bool v)
// TODO: works only if the window is not mapped! // TODO: works only if the window is not mapped!
_utility = v; _utility = v;
#if GTK_CHECK_VERSION(2, 20, 0)
if (gtk_widget_get_mapped(border)) if (gtk_widget_get_mapped(border))
#else
if (GTK_WIDGET_MAPPED(border))
#endif
{ {
remap = true; remap = true;
gtk_widget_unmap(border); gtk_widget_unmap(border);

6
gb.qt4/src/CFont.cpp
View File

@ -133,7 +133,9 @@ static void set_font_from_string(CFONT *_object, QString &str)
if (flag == "BOLD") if (flag == "BOLD")
{ {
f.setBold(true); f.setBold(true);
#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
f.setStyleName("Bold"); f.setStyleName("Bold");
#endif
} }
else if (flag == "ITALIC") else if (flag == "ITALIC")
f.setItalic(true); f.setItalic(true);
@ -150,12 +152,14 @@ static void set_font_from_string(CFONT *_object, QString &str)
f.setPointSizeF(SIZE_VIRTUAL_TO_REAL(size)); f.setPointSizeF(SIZE_VIRTUAL_TO_REAL(size));
else if (elt.length()) else if (elt.length())
{ {
f.setStyleName("");
f.setBold(false); f.setBold(false);
f.setItalic(false); f.setItalic(false);
f.setUnderline(false); f.setUnderline(false);
f.setStrikeOut(false); f.setStrikeOut(false);
f.setFamily(elt); f.setFamily(elt);
#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
f.setStyleName("");
#endif
} }
} }
} }