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

[GB.QT4]

Browse Source 
* BUG: Fix the Dialog.Font property.


git-svn-id: svn://localhost/gambas/trunk@2238 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2009-08-17 07:42:06 +00:00
parent 8dbb8a1e2a
commit ab8e67c2cc
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gb.qt4/src/CDialog.cpp
View File

@ -38,7 +38,7 @@ static QString dialog_title;
static GB_ARRAY dialog_filter = NULL; static GB_ARRAY dialog_filter = NULL;
static QString dialog_path; static QString dialog_path;
static GB_ARRAY dialog_paths = NULL; static GB_ARRAY dialog_paths = NULL;
static QFont *dialog_font; static CFONT *dialog_font = NULL;
static unsigned int dialog_color = 0; static unsigned int dialog_color = 0;
@ -72,18 +72,11 @@ static QString get_filter(void)
} }
BEGIN_METHOD_VOID(CDIALOG_init)
//dialog_font = new QFont();
END_METHOD
BEGIN_METHOD_VOID(CDIALOG_exit) BEGIN_METHOD_VOID(CDIALOG_exit)
GB.StoreObject(NULL, POINTER(&dialog_filter)); GB.StoreObject(NULL, POINTER(&dialog_filter));
GB.StoreObject(NULL, POINTER(&dialog_paths)); GB.StoreObject(NULL, POINTER(&dialog_paths));
if (dialog_font) GB.StoreObject(NULL, POINTER(&dialog_font));
delete dialog_font;
END_METHOD END_METHOD
@ -128,12 +121,14 @@ END_PROPERTY
BEGIN_PROPERTY(CDIALOG_font) BEGIN_PROPERTY(CDIALOG_font)
if (READ_PROPERTY) if (READ_PROPERTY)
GB.ReturnObject(CFONT_create(*dialog_font)); GB.ReturnObject(dialog_font);
else else
{ {
if (GB.CheckObject(VPROP(GB_OBJECT))) CFONT *font = (CFONT *)VPROP(GB_OBJECT);
return;
*dialog_font = *(((CFONT *)VPROP(GB_OBJECT))->font); GB.StoreObject(NULL, POINTER(&dialog_font));
if (font)
dialog_font = CFONT_create(*font->font);
} }
END_PROPERTY END_PROPERTY
@ -260,7 +255,10 @@ BEGIN_METHOD_VOID(CDIALOG_select_font)
int dpiX, dpiY; int dpiX, dpiY;
#endif #endif
qfont = *dialog_font; if (dialog_font)
qfont = *dialog_font->font;
else
qfont = QApplication::font();
//qDebug("AVANT: %g --> %g", qfont.pointSizeFloat(), SIZE_REAL_TO_VIRTUAL(qfont.pointSizeFloat())); //qDebug("AVANT: %g --> %g", qfont.pointSizeFloat(), SIZE_REAL_TO_VIRTUAL(qfont.pointSizeFloat()));
qfont.setPointSizeF(SIZE_REAL_TO_VIRTUAL(qfont.pointSizeF())); qfont.setPointSizeF(SIZE_REAL_TO_VIRTUAL(qfont.pointSizeF()));
@ -285,7 +283,8 @@ BEGIN_METHOD_VOID(CDIALOG_select_font)
GB.ReturnBoolean(true); GB.ReturnBoolean(true);
else else
{ {
*dialog_font = qfont; GB.StoreObject(NULL, POINTER(&dialog_font));
dialog_font = CFONT_create(qfont);
GB.ReturnBoolean(false); GB.ReturnBoolean(false);
} }
@ -295,7 +294,7 @@ GB_DESC CDialogDesc[] =
{ {
GB_DECLARE("Dialog", 0), GB_VIRTUAL_CLASS(), GB_DECLARE("Dialog", 0), GB_VIRTUAL_CLASS(),
GB_STATIC_METHOD("_init", NULL, CDIALOG_init, NULL), //GB_STATIC_METHOD("_init", NULL, CDIALOG_init, NULL),
GB_STATIC_METHOD("_exit", NULL, CDIALOG_exit, NULL), GB_STATIC_METHOD("_exit", NULL, CDIALOG_exit, NULL),
GB_STATIC_METHOD("OpenFile", "b", CDIALOG_open_file, "[(Multi)b]"), GB_STATIC_METHOD("OpenFile", "b", CDIALOG_open_file, "[(Multi)b]"),

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

@ -22,7 +22,6 @@
#define __CFONT_CPP #define __CFONT_CPP
#include "gambas.h" #include "gambas.h"
#include "main.h" #include "main.h"