Permalink
Browse files

1. remove debug tag of OVIMGenericSQ 2. Adjust notify location when c…

…andy present
  • Loading branch information...
1 parent 73bd6ea commit 6d50f040654b2441014d52409a4d47f6a013c18c @jrywu committed Sep 28, 2011
@@ -288,6 +288,7 @@ - (void)_handleNotifyMessage:(id)sender
NSRect lineHeightRect;
[sender attributesForCharacterIndex:0 lineHeightRectangle:&lineHeightRect];
location = lineHeightRect.origin;
+ //[self _fixCaretPosition:lineHeightRect.origin];
// TO DO: Handle tooltip better
// [uiController showTooltipWithText:notifyMsg];
@@ -87,8 +87,17 @@ - (void)showTooltipWithText:(NSString *)text atPoint:(NSPoint)point
[_tooltipTextView setNeedsDisplay:YES];
[_tooltipWindow setContentSize:[_tooltipTextView boundingRectForText].size];
+ //Jeremy '11,9,28 offset tooltip when candibar is visible
+ int candiOffset = 5;
+ if ([_candidateWindow isVisible]) {
+ NSRect candiFrameRect = [_candidateWindow frame];
+ candiOffset = candiFrameRect.size.height;
+ }
+
+
NSRect frameRect = [_tooltipWindow frame];
- point.y -= (frameRect.size.height + 5.0);
+
+ point.y -= (frameRect.size.height + candiOffset);
[_tooltipWindow setFrameOrigin:point];
if (![_tooltipWindow isVisible]) {
@@ -28,7 +28,7 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#define OV_DEBUG
+//#define OV_DEBUG
#define wildcardAutoCompose
#include "OVIMGenericSQ.h"
@@ -39,7 +39,6 @@
using namespace std;
OVCINSQList *cinlist=NULL;
-//SQLite3 *db=NULL;
extern "C" unsigned int OVGetLibraryVersion() {
return OV_VERSION;
@@ -27,7 +27,7 @@
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#define OV_DEBUG
+//#define OV_DEBUG
#include "OVOFReverseLookupSQ.h"
#if !defined(WIN32) && !defined(WINCE)
@@ -28,7 +28,7 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#define OV_DEBUG
+//#define OV_DEBUG
#define candiLimit 200
#include "OVCINSQ.h"
@@ -2338,7 +2338,7 @@
"-framework",
AppKit,
);
- PRODUCT_NAME = OpenVanilla;
+ PRODUCT_NAME = "OpenVanilla 0.9b";
SDKROOT = macosx;
};
name = Debug;
@@ -2363,7 +2363,7 @@
"-framework",
AppKit,
);
- PRODUCT_NAME = OpenVanilla;
+ PRODUCT_NAME = "OpenVanilla 0.9b";
SDKROOT = macosx;
ZERO_LINK = NO;
};

0 comments on commit 6d50f04

Please sign in to comment.