Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"diff mode" improvements. #100

Merged
merged 1 commit into from
Mar 20, 2024
Merged

"diff mode" improvements. #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Sources/CDiffWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@ void CDiffWindow::Work()
}

ArrangeWindows();

fScript->Select(0);
fScript->MakeFocus(true);
Activate();
}
catch (HErr& e)
{
Expand Down
5 changes: 3 additions & 2 deletions Sources/PApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,9 @@ void PApp::ArgvReceived(int32 argc, const char *argv[], const char * cwd)
}

if (invokeDiff == 2) {
// Size doesn't matter here as the window will be resized right away.
BRect r(0, 0, 0, 0);
// CDiffWindow get resized right away, but not if files are equal, so...
// Provide some sane defaults for its size.
BRect r(100, 100, 500, 250);
CDiffWindow *ndw = new CDiffWindow(r, "Differences");

BMessage msg(msg_Add2Files);
Expand Down