[MAGNIFY] Fix the magnification ratio bug for CORE-14946 #823
Conversation
This should already be visible in the patch :) (click on the commit, append |
| @@ -350,7 +351,7 @@ void GetBestOverlapWithMonitors(LPRECT rect) | |||
|
|
|||
| if (rcTop > (rcMon.bottom - rcHeight)) | |||
| rcTop = (rcMon.bottom - rcHeight); | |||
|
|
|||
There was a problem hiding this comment.
Extra trailing whitespace, please remove.
| @@ -923,9 +924,15 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar | |||
| if (HIWORD(wParam) == CBN_SELCHANGE) | |||
| { | |||
| HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); | |||
| LPCTSTR currentZoomValue = ""; | |||
There was a problem hiding this comment.
Please fix the indentation by remaining consistent with the rest of the file: no tabs, 4-spaces.
| LPCTSTR currentZoomValue = ""; | ||
|
|
||
| /* Get index of current selection and the text of that selection */ | ||
| unsigned int currentSelectionIndex = ComboBox_GetCurSel(hCombo); |
| /* Get index of current selection and the text of that selection */ | ||
| unsigned int currentSelectionIndex = ComboBox_GetCurSel(hCombo); | ||
| ComboBox_GetLBText(hCombo, currentSelectionIndex, currentZoomValue); | ||
| iZoom = atoi(currentZoomValue); |
|
Sorry for my negligence. I'll fix that. |
|
Hi, you haven't resolved the "conflict", as you still have the conflicting lines in your commit(s). |
LuRenJiasWorld
force-pushed
the
Patch-01
branch
from
d63f1a0
to
b5e2bd0
Compare
I think now it should be solved now. |
| @@ -18,6 +18,8 @@ | |||
| #include <winnls.h> | |||
| #include <shellapi.h> | |||
| #include <windowsx.h> | |||
| #include <stdlib.h> | |||
There was a problem hiding this comment.
Is stdlib.h really needed?
There was a problem hiding this comment.
I think it's needed, because when i try to delete this line, MSVC compiler gives me an error message "atoi undefined".
It seems that the _ttoi function is a marco defined in tchar.h, which will convert _ttoi automatically into atoi or wtoi depends on the environment.
| @@ -923,9 +925,15 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar | |||
| if (HIWORD(wParam) == CBN_SELCHANGE) | |||
| { | |||
| HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); | |||
| LPCTSTR currentZoomValue = ""; | |||
|
Yes, you are right. Thanks for your correction, you are so patient. And I think I should be more carefully, i.e, double check my code, especially the format before I submit a Pull Request. Anyway, you're really doing something absolutely great! I think I'll try my best to continually contribute to it in the future. |
You're welcome; and so that for your future PRs you will know what to look for 😃
Heh you are correct, I've just noticed that we compile the magnifier as an ANSI app (instead of UNICODE). |
|
Ah, I've just noticed that when committing your PR, the resulting commit doesn't have your human-readable author name+email. This is due to the problem of Github using Github's registered name as the author name instead of the original patch's author name, when doing a Squash+Commit operation. |
|
Actually the REAL fix is for PR authors to squash and rebase their code themselves, so that we don't have to use the "squash merge" option. Having your name+email as the default in github is only a workaround. |
|
Yeah, I think I will take both of your advice, and do better next time. : ) |
This bug was caused by leaving the magnify window unfreshed when trigger the "Magnification Level" ComboBox.
Fixed it.
JIRA issue: CORE-14946
(Sorry for repost this Pull Request)
Author: Benjamin Chris
Email: loli@lurenjia.in
(It's my real name and real email, I promise.)