t-suw****@users*****
t-suw****@users*****
2007年 11月 11日 (日) 01:54:25 JST
Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.52 AquaSKK/ChangeLog:1.53 --- AquaSKK/ChangeLog:1.52 Sat Nov 10 20:05:05 2007 +++ AquaSKK/ChangeLog Sun Nov 11 01:54:24 2007 @@ -1,3 +1,8 @@ +2007-11-11 Tomotaka SUWA <t.suw****@mac*****> + + * KanjiConversionMode.cpp: ヘルプ検索㨠Spotlight 検索ã§å€™è£œã‚¦ã‚£ãƒ³ + ドウãŒå‰é¢ã«è¡¨ç¤ºã•ã‚Œãªã„ä¸å…·åˆã‚’ä¿®æ£ã€‚ + 2007-11-10 Tomotaka SUWA <t.suw****@mac*****> * CandidatesManager.mm: ウィンドウレベルã«å¯¾å¿œã€‚ Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.16 AquaSKK/KanjiConversionMode.cpp:1.17 --- AquaSKK/KanjiConversionMode.cpp:1.16 Sat Nov 10 20:05:05 2007 +++ AquaSKK/KanjiConversionMode.cpp Sun Nov 11 01:54:25 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.16 2007/11/10 11:05:05 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.17 2007/11/10 16:54:25 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -1147,6 +1147,42 @@ current_candidate_index, candidates.size(), mode); } +SInt32 getCandidatesWindowLevel(const Point& pt) { + WindowRef active; + SInt32 level; + + // カーソルä½ç½®ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’å–å¾— + switch(FindWindow(pt, &active)) { + case inMenuBar: // ヘルプ検索 + return kCGMainMenuWindowLevel + 1; + + case inContent: // Carbon ウィンドウ + GetWindowGroupLevel(GetWindowGroup(active), &level); + return level + 1; + } + + // デフォルトã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒ¬ãƒ™ãƒ« + level = kCGFloatingWindowLevel; + + // Spotlight ã®å ´åˆã¯ç‰¹åˆ¥ã«å‡¦ç† + CFBundleRef mainBundle = CFBundleGetMainBundle(); + if(mainBundle) { + CFRetain(mainBundle); + CFStringRef id = CFBundleGetIdentifier(mainBundle); + CFRelease(mainBundle); + + if(id) { + CFRetain(id); + if(CFStringCompare(id, CFSTR("com.apple.spotlight"), kCFCompareCaseInsensitive) == 0) { + level = kCGPopUpMenuWindowLevel; + } + CFRelease(id); + } + } + + return level; +} + // éžãƒ¡ãƒ³ãƒ void openCandidatesWindow(const CppCFString& str_candidates, unsigned& window_id, @@ -1167,15 +1203,9 @@ SInt16 qd_x = offset_to_pos_params.fReplyPoint.h; SInt16 qd_y = offset_to_pos_params.fReplyPoint.v; - // Carbon アプリã§å€™è£œã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒå¾Œã‚ã«å›žã‚‹ã®ã‚’防ã - SInt32 level; - if(WindowRef active = ActiveNonFloatingWindow()) { - GetWindowGroupLevel(GetWindowGroup(active), &level); - ++ level; - } else { - level = kCGFloatingWindowLevel; - } - + // 候補ウィンドウã®ãƒ¬ãƒ™ãƒ«ã‚’å–å¾— + SInt32 level = getCandidatesWindowLevel(offset_to_pos_params.fReplyPoint); + // サーãƒãƒ¼ã«é€ã‚Šä»˜ã‘ã‚‹CFDataを作æˆã€‚ CppCFData cands_to_be_attached; cands_to_be_attached.own(str_candidates.toCFData());
Fork