Skip to content

Commit

Permalink
Win8.1/google日本語入力で検索するときの不具合を修正
Browse files Browse the repository at this point in the history
  • Loading branch information
Velmy committed Sep 4, 2015
1 parent cdf4e51 commit 243d7c6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions EpgTimer/EpgTimer/UserCtrlView/SearchKeyView.xaml
Expand Up @@ -17,8 +17,8 @@
</Grid.RowDefinitions>
<Label Content="検索キーワード" Height="28" HorizontalAlignment="Left" Margin="13,10,0,0" Name="label1" VerticalAlignment="Top" />
<Label Content="NOTキーワード" Height="28" HorizontalAlignment="Left" Margin="12,44,0,0" Name="label2" VerticalAlignment="Top" />
<ComboBox Height="24" Margin="112,13,82,0" Name="ComboBox_andKey" VerticalAlignment="Top" IsEditable="True" IsTextSearchEnabled="False"/>
<ComboBox Height="24" Margin="112,46,82,0" Name="ComboBox_notKey" VerticalAlignment="Top" IsEditable="True" IsTextSearchEnabled="False"/>
<ComboBox Height="24" Margin="112,13,82,0" Name="ComboBox_andKey" VerticalAlignment="Top" IsEditable="True" IsTextSearchEnabled="False" TextBoxBase.TextChanged="ComboBox_TextChanged"/>
<ComboBox Height="24" Margin="112,46,82,0" Name="ComboBox_notKey" VerticalAlignment="Top" IsEditable="True" IsTextSearchEnabled="False" TextBoxBase.TextChanged="ComboBox_TextChanged"/>
<Button Content="改行入力" Height="23" Margin="0,12,12,0" Name="button_andIn" VerticalAlignment="Top" HorizontalAlignment="Right" Width="64" Style="{StaticResource ButtonStyle1}" Click="button_andIn_Click" />
<Button Content="改行入力" Height="23" HorizontalAlignment="Right" Margin="0,46,12,0" Name="button_notIn" Style="{StaticResource ButtonStyle1}" VerticalAlignment="Top" Width="64" Click="button_notIn_Click" />
<my:SearchKeyDescView Grid.Row="1" x:Name="searchKeyDescView" />
Expand Down
9 changes: 9 additions & 0 deletions EpgTimer/EpgTimer/UserCtrlView/SearchKeyView.xaml.cs
Expand Up @@ -48,6 +48,15 @@ public SearchKey()
}
}

protected virtual void ComboBox_TextChanged(object sender, TextChangedEventArgs e)
{
var tb = e.OriginalSource as TextBox;
if (tb != null)
{
((ComboBox)sender).Text = tb.Text;
}
}

private void button_andIn_Click(object sender, RoutedEventArgs e)
{
KeyWordWindow dlg = new KeyWordWindow();
Expand Down

0 comments on commit 243d7c6

Please sign in to comment.