[Bf-blender-cvs] [60a035c] input_method_editor: set up ime branch
Severin
noreply at git.blender.org
Mon Nov 24 00:45:47 CET 2014
Commit: 60a035c52addad3d2c97d82b4b91fbe2587805f0
Author: Severin
Date: Mon Nov 17 18:18:11 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB60a035c52addad3d2c97d82b4b91fbe2587805f0
set up ime branch
===================================================================
M intern/ghost/CMakeLists.txt
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/space_text/text_draw.c
===================================================================
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 8f30564..9cc8ff3 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -264,12 +264,14 @@ elseif(WIN32)
intern/GHOST_SystemWin32.cpp
intern/GHOST_WindowWin32.cpp
intern/GHOST_DropTargetWin32.cpp
+ intern/GHOST_ImeWin32.cpp
intern/GHOST_DisplayManagerWin32.h
intern/GHOST_DropTargetWin32.h
intern/GHOST_SystemWin32.h
intern/GHOST_WindowWin32.h
intern/GHOST_TaskbarWin32.h
+ intern/GHOST_ImeWin32.h
)
if(NOT WITH_GL_EGL)
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 457907b..06a4541 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1326,7 +1326,6 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
}
}
-
/* text cursor */
vpos = but->pos;
#ifdef WITH_INPUT_IME
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index d6118a2..423155b 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1372,7 +1372,7 @@ void draw_text_main(SpaceText *st, ARegion *ar)
/* dpi controlled line height and font size */
st->lheight_dpi = (U.widget_unit * st->lheight) / 20;
- st->viewlines = (st->lheight_dpi) ? (int)(ar->winy - clip_min_y) / (st->lheight_dpi + TXT_LINE_SPACING) : 0
+ st->viewlines = (st->lheight_dpi) ? (int)(ar->winy - clip_min_y) / (st->lheight_dpi + TXT_LINE_SPACING) : 0;
/* make sure st->ime->tmp is not a null pointer*/
if (st->ime && !st->ime->tmp)
More information about the Bf-blender-cvs
mailing list