aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kvilib/config/kvi_settings.h10
-rw-r--r--src/kvirc/ui/kvi_ircview.cpp22
-rw-r--r--src/kvirc/ui/kvi_ircview.h11
-rw-r--r--src/kvirc/ui/kvi_ircviewprivate.h8
4 files changed, 10 insertions, 41 deletions
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 58293f6e2..1aadd4e2f 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -185,14 +185,4 @@
#endif
#endif
-#ifdef COMPILE_ON_MAC
- #define COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS 1
-#endif //COMPILE_ON_MAC
-
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- typedef qreal kvi_fontmetric_t;
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- typedef int kvi_fontmetric_t;
-#endif //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
-
#endif //_KVI_SETTINGS_H_
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 5e2e8af2e..e2fa8f18f 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -102,11 +102,7 @@
#include <QBitmap>
#include <QPainter>
#include <QRegExp>
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- #include <QFontMetricsF>
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- #include <QFontMetrics>
-#endif //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
+#include <QFontMetrics>
#include <QApplication>
#include <QMessageBox>
#include <QPaintEvent>
@@ -1976,26 +1972,17 @@ return false;
//============ recalcFontVariables ==============//
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
-void KviIrcView::recalcFontVariables(const QFontMetricsF &fm,const QFontInfo &fi)
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi)
-#endif //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
{
if(m_pFm)
delete m_pFm;
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- m_pFm = new QFontMetricsF(fm);
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
m_pFm = new QFontMetrics(fm);
-#endif //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
-
m_iFontLineSpacing = m_pFm->lineSpacing();
- if((m_iFontLineSpacing < (kvi_fontmetric_t)KVI_IRCVIEW_PIXMAP_SIZE) && KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages))
- m_iFontLineSpacing = (kvi_fontmetric_t)KVI_IRCVIEW_PIXMAP_SIZE;
+ if((m_iFontLineSpacing < KVI_IRCVIEW_PIXMAP_SIZE) && KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages))
+ m_iFontLineSpacing = KVI_IRCVIEW_PIXMAP_SIZE;
m_iFontDescent = m_pFm->descent();
m_iFontLineWidth = m_pFm->lineWidth();
@@ -2113,7 +2100,8 @@ void KviIrcView::chooseFont()
void KviIrcView::chooseBackground()
{
QString f;
- if(!KviFileDialog::askForOpenFileName(f,__tr2qs("Choose the background image...")))return;
+ if(!KviFileDialog::askForOpenFileName(f,__tr2qs("Choose the background image...")))
+ return;
if(f.isEmpty())return;
QPixmap p(f);
if(p.isNull())
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index ed876e16c..5711c0ac9 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -36,7 +36,6 @@
class QScrollBar;
class QLineEdit;
class QFile;
-class QFontMetricsF;
class QFontMetrics;
class KviTalPopupMenu;
@@ -104,7 +103,7 @@ private:
int m_iFontLineSpacing;
int m_iFontLineWidth;
int m_iFontDescent;
- kvi_fontmetric_t m_iFontCharacterWidth[256]; //1024 bytes fixed
+ int m_iFontCharacterWidth[256]; //1024 bytes fixed
int m_iWrapMargin;
int m_iMinimumPaintWidth;
@@ -136,11 +135,7 @@ private:
bool m_bPostedPaintEventPending;
KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting;
KviIrcView * m_pMasterView;
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- QFontMetricsF * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances)
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
QFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances)
-#endif
QMouseEvent * m_pLastEvent;
@@ -221,11 +216,7 @@ private:
void fastScroll(int lines = 1);
const kvi_wchar_t * getTextLine(int msg_type,const kvi_wchar_t * data_ptr,KviIrcViewLine *line_ptr,bool bEnableTimeStamp = true);
void calculateLineWraps(KviIrcViewLine *ptr,int maxWidth);
-#ifdef COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
- void recalcFontVariables(const QFontMetricsF &fm,const QFontInfo &fi);
-#else //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
void recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi);
-#endif //!COMPILE_IRCVIEW_FLOATING_POINT_FONT_METRICS
bool checkSelectionBlock(KviIrcViewLine * line,int bufIndex);
KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,QRect * pRect = 0,QString * linkCmd = 0,QString * linkText = 0);
void doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText);
diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h
index f225a4505..16bdcfbac 100644
--- a/src/kvirc/ui/kvi_ircviewprivate.h
+++ b/src/kvirc/ui/kvi_ircviewprivate.h
@@ -101,7 +101,7 @@ typedef struct _KviIrcViewWrappedBlock
KviIrcViewLineChunk * pChunk; // pointer to real line chunk or 0 for word wraps
int block_start; // this is generally different than pAttribute->block_idx!
int block_len; // length if the block in characters
- kvi_fontmetric_t block_width; // width of the block in pixels
+ int block_width; // width of the block in pixels
} _KVI_PACKED KviIrcViewWrappedBlock;
@@ -135,11 +135,11 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag
{
int selection_type;
int part_1_length;
- kvi_fontmetric_t part_1_width;
+ int part_1_width;
int part_2_length;
- kvi_fontmetric_t part_2_width;
+ int part_2_width;
int part_3_length;
- kvi_fontmetric_t part_3_width;
+ int part_3_width;
} KviIrcViewWrappedBlockSelectionInfo;
#ifdef COMPILE_ON_WINDOWS
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:36:13 +0000