Skip to content

Commit

Permalink
1.9.0
Browse files Browse the repository at this point in the history
・「複数動的補完を使用する」がオン、かつ補完キー入力と同時にローマ字仮名変換がおこなわれたとき、補完候補一覧が更新されない場合があるバグを修正しました。

・アプリケーションが縦書きのとき、かつ「複数補完を使用する」がオン、かつ「補完のときユーザー辞書を検索する」がオンのとき、ユーザー入力による辞書登録で補完の表示が更新されなかったバグを修正しました。

・アプリケーションが縦書きのとき、かつ「動的補完を使用する」がオン、かつ「複数補完を使用する」または「複数動的補完を使用する」がオンのとき、入力文字列自体は補完せずに表示するようにしました。
  • Loading branch information
nathancorvussolis committed Sep 2, 2015
1 parent 5e16b29 commit 3f57480
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# CorvusSKK ver. 1.8.12
# CorvusSKK ver. 1.9.0

Windowsで動作するSKK風のIMEです。

Expand Down
6 changes: 3 additions & 3 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define VERSION_H

#define TEXTSERVICE_NAME L"CorvusSKK"
#define TEXTSERVICE_VER L"1.8.12"
#define TEXTSERVICE_VER L"1.9.0"

#ifndef _DEBUG
#define TEXTSERVICE_DESC TEXTSERVICE_NAME
Expand All @@ -14,7 +14,7 @@
//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "1.8.12"
#define RC_VERSION_D 1,8,12,0
#define RC_VERSION "1.9.0"
#define RC_VERSION_D 1,9,0,0

#endif
30 changes: 26 additions & 4 deletions imcrvtip/KeyHandlerControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,12 @@ HRESULT CTextService::_HandleControl(TfEditCookie ec, ITfContext *pContext, BYTE
if(inputkey && !showentry)
{
_ConvRoman();

if(!complement)
{
_Update(ec, pContext);
}

_NextComp();

if(complement && cx_compuserdic)
Expand All @@ -359,7 +365,7 @@ HRESULT CTextService::_HandleControl(TfEditCookie ec, ITfContext *pContext, BYTE
_UserDicComp();
}

if(!cx_stacompmulti || !_Vertical)
if((!cx_stacompmulti && !cx_dyncompmulti) || !_Vertical || pContext == NULL)
{
okuriidx = kana.size();
if(candidx < candidates.size() && !candidates[candidx].first.second.empty())
Expand All @@ -374,9 +380,21 @@ HRESULT CTextService::_HandleControl(TfEditCookie ec, ITfContext *pContext, BYTE
okuriidx = 0;
}
}
else if(!complement && (cx_dynamiccomp || cx_dyncompmulti))
{
_DynamicComp(ec, pContext, TRUE);
}
else
{
_Update(ec, pContext);
if(!complement && cx_stacompmulti)
{
_EndCompletionList(ec, pContext);
}

if((!cx_stacompmulti && !cx_dyncompmulti) || !_Vertical || pContext == NULL)
{
_Update(ec, pContext);
}
}

if(complement && candidx == 0 && pContext != NULL)
Expand Down Expand Up @@ -410,7 +428,7 @@ HRESULT CTextService::_HandleControl(TfEditCookie ec, ITfContext *pContext, BYTE

if(complement && cx_compuserdic)
{
if(!cx_stacompmulti || !_Vertical)
if((!cx_stacompmulti && !cx_dyncompmulti) || !_Vertical || pContext == NULL)
{
okuriidx = kana.size();
if(candidx < candidates.size() && !candidates[candidx].first.second.empty())
Expand All @@ -435,7 +453,11 @@ HRESULT CTextService::_HandleControl(TfEditCookie ec, ITfContext *pContext, BYTE
{
_EndCompletionList(ec, pContext);
}
_Update(ec, pContext);

if((!cx_stacompmulti && !cx_dyncompmulti) || !_Vertical || pContext == NULL)
{
_Update(ec, pContext);
}
}
return S_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion imcrvtip/KeyHandlerConv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ void CTextService::_DynamicComp(TfEditCookie ec, ITfContext *pContext, BOOL sel)

okuriidx = kana_bak.size();

if(cx_dynamiccomp || (cx_compuserdic && !cx_dyncompmulti))
if(cx_dynamiccomp && (!cx_dyncompmulti || !_Vertical || pContext == NULL))
{
kana.insert(okuriidx, 1, CHAR_SKK_OKURI);

Expand Down
4 changes: 2 additions & 2 deletions installer/README.TXT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

==============================================================================

CorvusSKK ver. 1.8.12
CorvusSKK ver. 1.9.0

https://nathancorvussolis.github.io/
[email protected]
Expand All @@ -23,6 +23,6 @@

マニュアル

https://github.com/nathancorvussolis/corvusskk/blob/1.8.12/README.md
https://github.com/nathancorvussolis/corvusskk/blob/1.9.0/README.md

==============================================================================
2 changes: 1 addition & 1 deletion installer/_version.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

set VERSION=1.8.12
set VERSION=1.9.0
2 changes: 1 addition & 1 deletion installer/corvusskk-x64.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.8.12" ?>
<?define version="1.9.0" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="DBDB315C-1F74-4051-8A67-705D0FD16497">
Expand Down
2 changes: 1 addition & 1 deletion installer/corvusskk-x86.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.8.12" ?>
<?define version="1.9.0" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="3F1244EC-9A5C-4041-9A33-E26B03C63C9B">
Expand Down

0 comments on commit 3f57480

Please sign in to comment.