summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2013-04-19 09:20:56 +0000
committerManolo Gouy <Manolo>2013-04-19 09:20:56 +0000
commitc4494a94a7fe16e2c428632db3af2470adaba248 (patch)
tree89aa61201f4fad729d4cb0dab78c71635740b002 /src
parent53e2e603d0db67aa1d28557da2bca876902105e0 (diff)
Cosmetic improvement of image used when dragging non-text data.
Minimum OS version has been verified. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9892 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 96ca221e4..973bd5486 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3191,7 +3191,7 @@ static NSImage *imageFromText(const char *text, int *pwidth, int *pheight)
fl_font(FL_HELVETICA, 10);
p = text;
int nl = 0;
- while((q=strchr(p, '\n')) != NULL) {
+ while(nl < 100 && (q=strchr(p, '\n')) != NULL) {
nl++;
w2 = int(fl_width(p, q - p));
if (w2 > width) width = w2;
@@ -3232,7 +3232,7 @@ static NSImage *imageFromText(const char *text, int *pwidth, int *pheight)
static NSImage *defaultDragImage(int *pwidth, int *pheight)
{
- const int version_threshold = 100800;
+ const int version_threshold = 100700;
int width, height;
if (fl_mac_os_version >= version_threshold) {
width = 50; height = 40;
@@ -3246,7 +3246,7 @@ static NSImage *defaultDragImage(int *pwidth, int *pheight)
fl_font(FL_HELVETICA, 20);
fl_color(FL_BLACK);
char str[4];
- int l = fl_utf8encode(0x1F69A, str); // the "Delivery truck" Unicode character
+ int l = fl_utf8encode(0x1F69A, str); // the "Delivery truck" Unicode character from "Apple Color Emoji" font
fl_draw(str, l, 1, 16);
}
else { // draw two squares