Compare commits
No commits in common. "efb25b8aae0f4768d5b14f4688b2cb0a9eab80af" and "81bc5787738476aa4ea9d51954374af3a3ceae0b" have entirely different histories.
efb25b8aae
...
81bc578773
22
xW/xW.cpp
22
xW/xW.cpp
@ -499,7 +499,7 @@ convert_item_formatting(Relay::ItemData *item, CHARFORMAT2 &cf, bool &inverse)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static std::vector<BufferLineItem>
|
static std::vector<BufferLineItem>
|
||||||
convert_items(const std::vector<std::unique_ptr<Relay::ItemData>> &items)
|
convert_items(std::vector<std::unique_ptr<Relay::ItemData>> &items)
|
||||||
{
|
{
|
||||||
CHARFORMAT2 cf = default_charformat();
|
CHARFORMAT2 cf = default_charformat();
|
||||||
std::vector<BufferLineItem> result;
|
std::vector<BufferLineItem> result;
|
||||||
@ -685,12 +685,10 @@ buffer_print_line(std::vector<BufferLine>::const_iterator begin,
|
|||||||
static void
|
static void
|
||||||
buffer_print_separator()
|
buffer_print_separator()
|
||||||
{
|
{
|
||||||
bool sameline = !GetWindowTextLength(g.hwndBuffer);
|
|
||||||
|
|
||||||
CHARFORMAT2 format = default_charformat();
|
CHARFORMAT2 format = default_charformat();
|
||||||
format.dwEffects &= ~CFE_AUTOCOLOR;
|
format.dwEffects &= ~CFE_AUTOCOLOR;
|
||||||
format.crTextColor = RGB(0xff, 0x5f, 0x00);
|
format.crTextColor = RGB(0xff, 0x5f, 0x00);
|
||||||
richedit_replacesel(g.hwndBuffer, &format, &L"\n---"[sameline]);
|
richedit_replacesel(g.hwndBuffer, &format, L"\n---");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -956,7 +954,6 @@ relay_process_message(const Relay::EventMessage &m)
|
|||||||
b->highlighted = false;
|
b->highlighted = false;
|
||||||
SendMessage(g.hwndBufferList, LB_SETCURSEL, b - g.buffers.data(), 0);
|
SendMessage(g.hwndBufferList, LB_SETCURSEL, b - g.buffers.data(), 0);
|
||||||
|
|
||||||
refresh_icon();
|
|
||||||
refresh_topic(b->topic);
|
refresh_topic(b->topic);
|
||||||
refresh_buffer(*b);
|
refresh_buffer(*b);
|
||||||
refresh_prompt();
|
refresh_prompt();
|
||||||
@ -1630,21 +1627,6 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||||||
if (auto b = buffer_by_name(g.buffer_current))
|
if (auto b = buffer_by_name(g.buffer_current))
|
||||||
refresh_buffer(*b);
|
refresh_buffer(*b);
|
||||||
return 0;
|
return 0;
|
||||||
case WM_SYSCOLORCHANGE:
|
|
||||||
// The topic would flicker with WS_EX_TRANSPARENT.
|
|
||||||
// The buffer only changed its text colour, not background.
|
|
||||||
SendMessage(g.hwndTopic,
|
|
||||||
EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_3DFACE));
|
|
||||||
SendMessage(g.hwndBuffer,
|
|
||||||
EM_SETBKGNDCOLOR, 1, 0);
|
|
||||||
|
|
||||||
// XXX: This is incomplete, we'd have to run convert_items() again;
|
|
||||||
// essentially only COLOR_GRAYTEXT is reloaded in here.
|
|
||||||
if (auto b = buffer_by_name(g.buffer_current))
|
|
||||||
refresh_buffer(*b);
|
|
||||||
|
|
||||||
// Pass it to all child windows, through DefWindowProc().
|
|
||||||
break;
|
|
||||||
case WM_ACTIVATE:
|
case WM_ACTIVATE:
|
||||||
if (LOWORD(wParam) == WA_INACTIVE)
|
if (LOWORD(wParam) == WA_INACTIVE)
|
||||||
g.hwndLastFocused = GetFocus();
|
g.hwndLastFocused = GetFocus();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user